diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2016-02-09 14:23:10 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-02-09 14:23:10 -0800 |
| commit | b3fc7a3e763fb260cd932dc6aedbe7b4c810a73c (patch) | |
| tree | 72495a45c9e58f16f6b09448f6956507da6ccf89 /test/manual/etags/ETAGS.good_1 | |
| parent | c71e7cc113ed0d5f01aaa2e441a3e3c9fbeb9fa5 (diff) | |
| parent | 9ffe7ddd5e1ba93f327cfe985e9476571d7a2873 (diff) | |
| download | emacs-b3fc7a3e763fb260cd932dc6aedbe7b4c810a73c.tar.gz | |
Merge from origin/emacs-25
9ffe7dd * lisp/isearch.el (isearch-define-mode-toggle): Improve logic
16140f7 * lisp/menu-bar.el (menu-bar-options-menu): New search submenu
3db6adb * lisp/isearch.el (search-default-mode)
4ea1ea7 * lisp/isearch.el: Rename search-default-regexp-mode to search-default-mode
c77ffc8 Use monitor's resolution for positioning tooltips
49e5749 Fix file-notify-test on MS-Windows
be1d874 Fix issues found by auditing w32notify code
87ae218 Extend etags Ruby support for accessors
aa35257 Update publicsuffix.txt.
6816bff Ensure that Gnus dribble handling allows removing entries
691feae Be consistent when using encoded strings in nnimap data
3ed423b Display the decoded Gnus group name
5428b5b Use completion-ignore-case instead of defining command
Diffstat (limited to 'test/manual/etags/ETAGS.good_1')
| -rw-r--r-- | test/manual/etags/ETAGS.good_1 | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/test/manual/etags/ETAGS.good_1 b/test/manual/etags/ETAGS.good_1 index 90bbe774f05..d2550863428 100644 --- a/test/manual/etags/ETAGS.good_1 +++ b/test/manual/etags/ETAGS.good_1 @@ -3061,7 +3061,7 @@ module ModuleExample1,0 def module_instance_method46,1051 def ModuleExample.module_class_methodmodule_class_method49,1131 -ruby-src/test1.ru,785 +ruby-src/test1.ru,935 class A1,0 def a(2,8 def b(5,38 @@ -3084,9 +3084,13 @@ module A9,57 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 + alias_method :xyz,xyz33,456 + :tee ; attr_reader :subtlesubtle34,479 + attr_reader(:foo1,foo135,523 + attr_reader(:foo1, :bar1,bar135,523 + :qux1)qux136,563 + alias_method ( :foo2,foo237,586 +A::Constant Constant42,655 tex-src/testenv.tex,52 \newcommand{\nm}\nm4,77 |