]> code.delx.au - gnu-emacs/blobdiff - test/manual/etags/ETAGS.good_3
Merge emacs-25 into master (using imerge)
[gnu-emacs] / test / manual / etags / ETAGS.good_3
index 37eaafbab61d3adffc12636e8e1844e28cb3b976..43b84eed5d290e3811e32d519b2b75d70c81357d 100644 (file)
@@ -2391,25 +2391,25 @@ void agent::move(\7fmove\ 153,1353
 cp-src/clheir.hpp,682
 class generic_object\7f13,520
     int where_in_registry;\7f15,547
-    virtual void compute_next_state(\7f21,842
-    virtual void step(\7f22,888
-const int max_num_directions \7f31,1219
-class location:\7flocation\ 133,1289
-    location(\7f43,1642
-class irregular_location:\7firregular_location\ 147,1686
-    double x,\7f49,1734
-    double x, y,\7f49,1734
-    double x, y, z;\7f49,1734
-    irregular_location(\7f51,1762
-class discrete_location:\7fdiscrete_location\ 156,1889
-    int x,\7f58,1936
-    int x, y,\7f58,1936
-    int x, y, z;\7f58,1936
-    class location *neighbors[\7fneighbors\ 159,1953
-    discrete_location(\7f62,2044
-    void assign_neighbor(\7f66,2184
-class agent:\7fagent\ 175,2508
-    location *where;\7fwhere\ 177,2549
+    virtual void compute_next_state(\7f21,843
+    virtual void step(\7f22,889
+const int max_num_directions \7f31,1220
+class location:\7flocation\ 133,1290
+    location(\7f43,1643
+class irregular_location:\7firregular_location\ 147,1687
+    double x,\7f49,1735
+    double x, y,\7f49,1735
+    double x, y, z;\7f49,1735
+    irregular_location(\7f51,1763
+class discrete_location:\7fdiscrete_location\ 156,1890
+    int x,\7f58,1937
+    int x, y,\7f58,1937
+    int x, y, z;\7f58,1937
+    class location *neighbors[\7fneighbors\ 159,1954
+    discrete_location(\7f62,2045
+    void assign_neighbor(\7f66,2185
+class agent:\7fagent\ 175,2509
+    location *where;\7fwhere\ 177,2550
 \f
 cp-src/fail.C,330
 struct A \7f7,263
@@ -2535,28 +2535,28 @@ el-src/emacs/lisp/progmodes/etags.el,5069
 (defun next-file \7f1685,67976
 (defvar tags-loop-operate \7f1760,70890
 (defvar tags-loop-scan\7f1763,70984
-(defun tags-loop-eval \7f1771,71314
-(defun tags-loop-continue \7f1782,71643
-(defun tags-search \7f1850,73949
-(defun tags-query-replace \7f1871,74775
-(defun tags-complete-tags-table-file \7f1896,75999
-(defun list-tags \7f1906,76378
-(defun tags-apropos \7f1934,77331
-(define-button-type 'tags-select-tags-table\7ftags-select-tags-table\ 11957,78157
-(defun select-tags-table \7f1964,78396
-(defvar select-tags-table-mode-map \7f2019,80523
-(define-derived-mode select-tags-table-mode \7f2030,80906
-(defun select-tags-table-select \7f2034,81090
-(defun select-tags-table-quit \7f2043,81456
-(defun complete-tag \7f2049,81611
-(defconst etags--xref-limit \7f2074,82552
-(defvar etags-xref-find-definitions-tag-order \7f2076,82587
-(defun etags-xref-find \7f2082,82877
-(defun etags--xref-find-definitions \7f2096,83406
-(defclass xref-etags-location \7f2129,85121
-(defun xref-make-etags-location \7f2135,85344
-(cl-defmethod xref-location-marker \7f2139,85499
-(cl-defmethod xref-location-line \7f2146,85743
+(defun tags-loop-eval \7f1771,71313
+(defun tags-loop-continue \7f1782,71642
+(defun tags-search \7f1850,73948
+(defun tags-query-replace \7f1871,74774
+(defun tags-complete-tags-table-file \7f1896,75998
+(defun list-tags \7f1906,76377
+(defun tags-apropos \7f1934,77330
+(define-button-type 'tags-select-tags-table\7ftags-select-tags-table\ 11957,78156
+(defun select-tags-table \7f1964,78395
+(defvar select-tags-table-mode-map \7f2019,80522
+(define-derived-mode select-tags-table-mode \7f2030,80905
+(defun select-tags-table-select \7f2034,81089
+(defun select-tags-table-quit \7f2043,81455
+(defun complete-tag \7f2049,81610
+(defconst etags--xref-limit \7f2074,82551
+(defvar etags-xref-find-definitions-tag-order \7f2076,82586
+(defun etags-xref-find \7f2082,82876
+(defun etags--xref-find-definitions \7f2096,83405
+(defclass xref-etags-location \7f2129,85120
+(defun xref-make-etags-location \7f2135,85343
+(cl-defmethod xref-location-marker \7f2139,85498
+(cl-defmethod xref-location-line \7f2146,85742
 \f
 erl-src/gs_dialog.erl,98
 -define(VERSION\7f2,32
@@ -2653,49 +2653,63 @@ function MoveLayerBottom \7f223,5079
 function MoveLayerBefore \7f236,5457
 function MoveLayerAfter \7f258,6090
 \f
+lua-src/test.lua,442
+function Rectangle.getPos \7f2,15
+function Rectangle.getPos \7fgetPos\ 12,15
+function Circle.getPos \7f6,61
+function Circle.getPos \7fgetPos\ 16,61
+function Cube.data.getFoo \7f10,102
+function Cube.data.getFoo \7fgetFoo\ 110,102
+function Square.something:Bar \7f14,148
+function Square.something:Bar \7fBar\ 114,148
+   function test.me_22a(\7f22,241
+   function test.me_22a(\7fme_22a\ 122,241
+   local function test.me22b \7f25,297
+   local function test.me22b \7fme22b\ 125,297
+\f
 make-src/Makefile,1133
 LATEST=\7f1,0
-NONSRCS=\7f35,1578
-CPPFLAGS=\7f49,2191
-LDFLAGS=\7f50,2260
-FASTCFLAGS=\7f55,2531
-FILTER=\7f58,2642
-       @-$(\7f$\ 172,3064
-       @-$(\7f$\ 173,3113
-       @-$(\7f$\ 174,3177
-       @-$(\7f$\ 175,3223
-       @-$(\7f$\ 176,3291
-       @-$(\7f$\ 177,3383
-       @$(\7f81,3466
-       @$(\7f82,3514
-       @$(\7f83,3577
-       @$(\7f84,3622
-       @$(\7f85,3689
-       @$(\7f86,3780
-${CHECKOBJS}: CFLAGS=\7f88,3806
-       @env CHECKEROPTS=\7f92,3922
-       @$(\7f98,4094
-       @$(\7f106,4250
-       @$(\7f110,4374
-       @$(\7f114,4500
-       @for i in $(SRCS); do echo $$i;\7f140,5315
-       $(\7f160,6053
-       $(\7f163,6114
-       $(\7f166,6177
-       $(\7f169,6228
-       $(\7f172,6317
-       sdiff --suppress-common-lines --width=\7fwidth\ 1186,6614
-       sdiff --suppress-common-lines --width=\7fwidth\ 1189,6703
-       sdiff --suppress-common-lines --width=\7fwidth\ 1192,6791
-       sdiff --suppress-common-lines --width=\7fwidth\ 1195,6880
-       TEXTAGS=\7f204,7122
-       TEXTAGS=def:newcommand:newenvironment ${RUN} etags$* --regex=\7fregex\ 1204,7122
-       ${RUN} etags12 --members -o $@ --regex=\7fregex\ 1207,7239
-       ${RUN} ./ctags -o $@ --regex=\7fregex\ 1213,7388
-       ${RUN} ctags$* -wtTd --globals --members -o $@ --regex=\7fregex\ 1216,7464
-       TEXTAGS=\7f219,7583
-       TEXTAGS=def:newcommand:newenvironment ${RUN} ctags$* -wt -o $@ --regex=\7fregex\ 1219,7583
-       ${RUN} ./extags -e --regex-c=\7fc\ 1222,7710
+NONSRCS=\7f35,1577
+CPPFLAGS=\7f49,2190
+LDFLAGS=\7f50,2259
+FASTCFLAGS=\7f55,2530
+FILTER=\7f58,2641
+       @-$(\7f$\ 172,3063
+       @-$(\7f$\ 173,3112
+       @-$(\7f$\ 174,3176
+       @-$(\7f$\ 175,3222
+       @-$(\7f$\ 176,3290
+       @-$(\7f$\ 177,3382
+       @$(\7f81,3465
+       @$(\7f82,3513
+       @$(\7f83,3576
+       @$(\7f84,3621
+       @$(\7f85,3688
+       @$(\7f86,3779
+${CHECKOBJS}: CFLAGS=\7f88,3805
+       @env CHECKEROPTS=\7f92,3921
+       @$(\7f98,4093
+       @$(\7f106,4249
+       @$(\7f110,4373
+       @$(\7f114,4499
+       @for i in $(SRCS); do echo $$i;\7f140,5320
+       $(\7f160,6058
+       $(\7f163,6119
+       $(\7f166,6182
+       $(\7f169,6233
+       $(\7f172,6322
+       sdiff --suppress-common-lines --width=\7fwidth\ 1186,6619
+       sdiff --suppress-common-lines --width=\7fwidth\ 1189,6708
+       sdiff --suppress-common-lines --width=\7fwidth\ 1192,6796
+       sdiff --suppress-common-lines --width=\7fwidth\ 1195,6885
+       TEXTAGS=\7f204,7127
+       TEXTAGS=def:newcommand:newenvironment ${RUN} etags$* --regex=\7fregex\ 1204,7127
+       ${RUN} etags12 --members -o $@ --regex=\7fregex\ 1207,7244
+       ${RUN} ./ctags -o $@ --regex=\7fregex\ 1213,7393
+       ${RUN} ctags$* -wtTd --globals --members -o $@ --regex=\7fregex\ 1216,7469
+       TEXTAGS=\7f219,7588
+       TEXTAGS=def:newcommand:newenvironment ${RUN} ctags$* -wt -o $@ --regex=\7fregex\ 1219,7588
+       ${RUN} ./extags -e --regex-c=\7fc\ 1222,7715
 \f
 objc-src/Subprocess.h,98
 #define Subprocess \7f41,1217
@@ -3307,6 +3321,31 @@ class Configure(\7f760,24879
     def save(\7f797,26022
     def nosave(\7f807,26310
 \f
+ruby-src/test.rb,594
+module ModuleExample\7f1,0
+    class ClassExample\7f2,21
+        def class_method\7f3,44
+        def ClassExample.singleton_class_method\7f6,116
+        def class_method_exclamation!\7f9,221
+        def class_method_question?\7f12,319
+        def class_method_equals=\7fclass_method_equals=\ 115,411
+        def `(\7f18,499
+        def +(\7f21,589
+        def [](\7f24,637
+        def []=(\7f[]=\ 127,687
+        def <<(\7f30,749
+        def ==(\7f==\ 133,799
+        def <=(\7f<=\ 136,869
+        def <=>(\7f<=>\ 139,940
+        def ===(\7f===\ 142,987
+    def module_method\7f46,1048
+    def ModuleExample.singleton_module_method\7f49,1110
+\f
+ruby-src/test1.ruby,37
+class A\7f1,0
+ def a(\7f2,8
+ def b(\7f5,38
+\f
 tex-src/testenv.tex,52
 \newcommand{\nm}\7f\nm\ 14,77
 \section{blah}\7fblah\ 18,139