diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2016-02-09 14:23:09 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-02-09 14:23:09 -0800 |
| commit | fdc2da4ef44b32e2dd360defc9bd64d644ed1783 (patch) | |
| tree | 0c4c996897292cec2115b21f40db68836af0190e /test/manual/etags/ETAGS.good_5 | |
| parent | f414fe61dd5e9f54c562adc65739305198173001 (diff) | |
| parent | 2c117fc7e283ad20f404c392be433c74f5cf8a4e (diff) | |
| download | emacs-fdc2da4ef44b32e2dd360defc9bd64d644ed1783.tar.gz | |
Merge from origin/emacs-25
2c117fc * etc/NEWS: Document new mpc.el features
71a0496 * lisp/custom.el (defface): Revert indentation change. (Bug#22524)
9dfece1 Correctly fontify C++ initializations which "look like" functions.
4485222 Improve newsticker-treeview-selection-face
4236944 Minor fix in tagging Ruby accessors by etags
35fc77d Spelling fixes
3dda110 Remove 'def X' from the example
Diffstat (limited to 'test/manual/etags/ETAGS.good_5')
| -rw-r--r-- | test/manual/etags/ETAGS.good_5 | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/test/manual/etags/ETAGS.good_5 b/test/manual/etags/ETAGS.good_5 index ee19bcfc9d2..9ea77977ab6 100644 --- a/test/manual/etags/ETAGS.good_5 +++ b/test/manual/etags/ETAGS.good_5 @@ -4142,7 +4142,7 @@ module ModuleExample1,0 def module_instance_method46,1051 def ModuleExample.module_class_methodmodule_class_method49,1131 -ruby-src/test1.ru,828 +ruby-src/test1.ru,785 class A1,0 def a(2,8 def b(5,38 @@ -4154,21 +4154,20 @@ module A9,57 def foo!15,121 def self._bar?(_bar?18,143 def qux=(qux=22,194 - def X25,232 - attr_reader :foofoo26,242 - attr_reader :read1 read127,265 - attr_reader :read1 , :read2;read227,265 - attr_reader :read1 , :read2; attr_writer :write1,write1=27,265 - attr_reader :read1 , :read2; attr_writer :write1, :write2write2=27,265 - attr_writer :bar,bar=28,329 - :baz,baz=29,353 - :moremore=30,377 - attr_accessor :teetee31,401 - attr_accessor :teetee=31,401 - alias_method :qux,qux32,426 - alias_method :xyz,xyz33,478 - :tee ; attr_reader :subtlesubtle34,503 -A::Constant Constant39,568 + attr_reader :foofoo26,233 + attr_reader :read1 read127,254 + attr_reader :read1 , :read2;read227,254 + attr_reader :read1 , :read2; attr_writer :write1,write1=27,254 + attr_reader :read1 , :read2; attr_writer :write1, :write2write2=27,254 + attr_writer :bar,bar=28,316 + :baz,baz=29,338 + :moremore=30,360 + attr_accessor :teetee31,382 + attr_accessor :teetee=31,382 + alias_method :qux,qux32,405 + alias_method :xyz,xyz33,455 + :tee ; attr_reader :subtlesubtle34,478 +A::Constant Constant38,533 tex-src/testenv.tex,52 \newcommand{\nm}\nm4,77 |