Merge from origin/emacs-25

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

diff --git a/test/manual/etags/ETAGS.good_3 b/test/manual/etags/ETAGS.good_3
index a1e895af7f6f6721c18c5dc938586f687ee7fe38..e3855a593092f1e907e687cd92c88c8e10cf2707 100644 (file)
--- a/test/manual/etags/ETAGS.good_3
+++ b/test/manual/etags/ETAGS.good_3
@@ -3408,7 +3408,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,828
+ruby-src/test1.ru,785
 class A\7f1,0
  def a(\7f2,8
  def b(\7f5,38
@@ -3420,21 +3420,20 @@ module A\7f9,57
     def foo!\7f15,121
     def self._bar?(\7f_bar?\ 118,143
       def qux=(\7fqux=\ 122,194
-    def X\7f25,232
-      attr_reader :foo\7ffoo\ 126,242
-      attr_reader :read1 \7fread1\ 127,265
-      attr_reader :read1 , :read2;\7fread2\ 127,265
-      attr_reader :read1 , :read2; attr_writer :write1,\7fwrite1=\ 127,265
-      attr_reader :read1 , :read2; attr_writer :write1, :write2\7fwrite2=\ 127,265
-      attr_writer :bar,\7fbar=\ 128,329
-                  :baz,\7fbaz=\ 129,353
-                  :more\7fmore=\ 130,377
-      attr_accessor :tee\7ftee\ 131,401
-      attr_accessor :tee\7ftee=\ 131,401
-      alias_method :qux,\7fqux\ 132,426
-      alias_method :xyz,\7fxyz\ 133,478
-                   :tee ; attr_reader :subtle\7fsubtle\ 134,503
-A::Constant \7fConstant\ 139,568
+    attr_reader :foo\7ffoo\ 126,233
+    attr_reader :read1 \7fread1\ 127,254
+    attr_reader :read1 , :read2;\7fread2\ 127,254
+    attr_reader :read1 , :read2; attr_writer :write1,\7fwrite1=\ 127,254
+    attr_reader :read1 , :read2; attr_writer :write1, :write2\7fwrite2=\ 127,254
+    attr_writer :bar,\7fbar=\ 128,316
+                :baz,\7fbaz=\ 129,338
+                :more\7fmore=\ 130,360
+    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
 \f
 tex-src/testenv.tex,52
 \newcommand{\nm}\7f\nm\ 14,77