Merge from origin/emacs-25

[gnu-emacs] / test / manual / etags / ETAGS.good_5

diff --git a/test/manual/etags/ETAGS.good_5 b/test/manual/etags/ETAGS.good_5
index 9ea77977ab6a28cbe3aeb1f9c89fa9b8bbfb9239..9e3b258eabcc4ddb3acfaacc8b760daeda2833fa 100644 (file)
--- a/test/manual/etags/ETAGS.good_5
+++ b/test/manual/etags/ETAGS.good_5
@@ -4142,7 +4142,7 @@ module ModuleExample\7f1,0
     def module_instance_method\7f46,1051
     def ModuleExample.module_class_method\7fmodule_class_method\ 149,1131
 \f
-ruby-src/test1.ru,785
+ruby-src/test1.ru,935
 class A\7f1,0
  def a(\7f2,8
  def b(\7f5,38
@@ -4165,9 +4165,13 @@ module A\7f9,57
     attr_accessor :tee\7ftee\ 131,382
     attr_accessor :tee\7ftee=\ 131,382
     alias_method :qux,\7fqux\ 132,405
-    alias_method :xyz,\7fxyz\ 133,455
-                 :tee ; attr_reader :subtle\7fsubtle\ 134,478
-A::Constant \7fConstant\ 138,533
+    alias_method :xyz,\7fxyz\ 133,456
+                 :tee ; attr_reader :subtle\7fsubtle\ 134,479
+    attr_reader(:foo1,\7ffoo1\ 135,523
+    attr_reader(:foo1, :bar1,\7fbar1\ 135,523
+                :qux1)\7fqux1\ 136,563
+    alias_method ( :foo2,\7ffoo2\ 137,586
+A::Constant \7fConstant\ 142,655
 \f
 tex-src/testenv.tex,52
 \newcommand{\nm}\7f\nm\ 14,77