11 files changed, 834 insertions, 310 deletions
diff --git a/test/etags/ruby-src/test1.ru b/test/etags/ruby-src/test1.ru
new file mode 100644
index 00000000000..bc9dbec36a2
--- /dev/null
+++ b/test/etags/ruby-src/test1.ru
@@ -0,0 +1,42 @@
+class A
+ def a()
+  super(" do ")
+ end
+ def b()
+ end
+end
+module A
+  class B
+    ABC = 4
+    Def_ = 'blah'
+    Xyzzy =10
+    def foo!
+    end
+    def self._bar?(abc)
+    end
+    class << self
+      def qux=(tee)
+      end
+    end
+    def X
+      attr_reader :foo
+      attr_reader :read1 , :read2; attr_writer :write1, :write2
+      attr_writer :bar,
+                  :baz,
+                  :more
+      attr_accessor :tee
+      alias_method :qux, :tee, attr_accessor :bogus
+      alias_method :xyz,
+                   :tee ; attr_reader :subtle
+    end
+  end
+end
+A::Constant = 5
+# def foo_in_comment
+# end
diff --git a/test/manual/etags/CTAGS.good b/test/manual/etags/CTAGS.good
index 846725ef713..b78c194ac44 100644
--- a/test/manual/etags/CTAGS.good
+++ b/test/manual/etags/CTAGS.good
@@ -1,17 +1,5 @@
 #a-defer-word   forth-src/test-forth.fth        /^defer #a-defer-word$/
 #some-storage   forth-src/test-forth.fth        /^2000 buffer: #some-storage$/
-$       make-src/Makefile       /^      @-$(MAKE) OPTIONS='--no-members' ${LATEST}ediff$/
-$       make-src/Makefile       /^      @-$(MAKE) OPTIONS='--declarations --no-members' $/
-$       make-src/Makefile       /^      @-$(MAKE) OPTIONS='--members' ${LATEST}ediff$/
-$       make-src/Makefile       /^      @-$(MAKE) OPTIONS='--regex=@regexfile --no-member/
-$       make-src/Makefile       /^      @-$(MAKE) OPTIONS='nonexistent --members --declar/
-$       make-src/Makefile       /^      @-$(MAKE) ${LATEST}cdiff$/
-$       make-src/Makefile       /^      $(CC) ${FASTCFLAGS} -c $?$/
-$       make-src/Makefile       /^      $(CC) ${FASTCFLAGS} -c $?$/
-$       make-src/Makefile       /^      $(CC) ${FASTCFLAGS} -c $?$/
-$       make-src/Makefile       /^      $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o etags e/
-$       make-src/Makefile       /^      $(CC) $(CFLAGS) $(CPPFLAGS) -DCTAGS $(LDFLAGS) -o/
-$$i     make-src/Makefile       140
 $0x80   c-src/sysdep.h  32
 $SYS_##syscall_na       c-src/sysdep.h  31
 $domain php-src/lce_functions.php       175
@@ -41,6 +29,9 @@ $unk_comment_lc	php-src/lce_functions.php	117
 $user_comment   php-src/lce_functions.php       109
 $user_comment   php-src/lce_functions.php       167
 $user_comment_lc        php-src/lce_functions.php       115
+${CHECKOBJS}    make-src/Makefile       /^${CHECKOBJS}: CFLAGS=-g3 -DNULLFREECHECK=0$/
+%cdiff  make-src/Makefile       /^%cdiff: CTAGS% CTAGS ${infiles}$/
+%ediff  make-src/Makefile       /^%ediff: ETAGS% ETAGS ${infiles}$/
 ($_,$flag,$opt,$f,$r,@temp      perl-src/yagrip.pl      8
 ($prog,$_,@list perl-src/yagrip.pl      39
 ($string,$flag,@string,@temp,@last      perl-src/yagrip.pl      40
@@ -48,6 +39,7 @@ $user_comment_lc	php-src/lce_functions.php	115
 (another-forth-word     forth-src/test-forth.fth        /^: (another-forth-word) ( -- )$/
 +       ruby-src/test.rb        /^        def +(y)$/
 +       tex-src/texinfo.tex     /^\\def+{{\\tt \\char 43}}$/
+.PRECIOUS       make-src/Makefile       /^.PRECIOUS: ETAGS CTAGS ETAGS16 CTAGS16 ETAGS17 CTA/
 /.notdef        ps-src/rfc1245.ps       /^\/.notdef \/.notdef \/.notdef \/.notdef \/.notdef \/.not/
 /.notdef        ps-src/rfc1245.ps       /^\/.notdef \/.notdef \/.notdef \/.notdef \/.notdef \/.not/
 /.notdef        ps-src/rfc1245.ps       /^\/.notdef \/.notdef \/.notdef \/.notdef \/.notdef \/.not/
@@ -138,6 +130,8 @@ $user_comment_lc	php-src/lce_functions.php	115
 /graymode       ps-src/rfc1245.ps       /^\/graymode true def$/
 /grayness       ps-src/rfc1245.ps       /^\/grayness {$/
 /guillemotleft  ps-src/rfc1245.ps       /^\/guillemotleft \/guillemotright \/ellipsis \/.notdef /
+/home/www/pub/etags.c.gz        make-src/Makefile       /^\/home\/www\/pub\/etags.c.gz: etags.c$/
+/home/www/pub/software/unix/etags.tar.gz        make-src/Makefile       /^\/home\/www\/pub\/software\/unix\/etags.tar.gz: Makefile/
 /hx     ps-src/rfc1245.ps       /^\/hx { $/
 /i      ps-src/rfc1245.ps       /^\/i \/j \/k \/l \/m \/n \/o \/p \/q \/r \/s \/t \/u \/v \/w \/x \/y/
 /iacute ps-src/rfc1245.ps       /^\/iacute \/igrave \/icircumflex \/idieresis \/ntilde \/o/
@@ -207,16 +201,6 @@ $user_comment_lc	php-src/lce_functions.php	115
 >       tex-src/texinfo.tex     /^\\def>{{\\tt \\gtr}}$/
 >field1 forth-src/test-forth.fth        /^   9   field   >field1$/
 >field2 forth-src/test-forth.fth        /^   5   field   >field2$/
-@$      make-src/Makefile       /^      @$(MAKE) OPTIONS='--no-members' ${LATEST}ediff$/
-@$      make-src/Makefile       /^      @$(MAKE) OPTIONS='--declarations --no-members' ${/
-@$      make-src/Makefile       /^      @$(MAKE) OPTIONS='--members' ${LATEST}ediff$/
-@$      make-src/Makefile       /^      @$(MAKE) OPTIONS='--regex=@regexfile --no-members/
-@$      make-src/Makefile       /^      @$(MAKE) OPTIONS='nonexistent --members --declara/
-@$      make-src/Makefile       /^      @$(MAKE) ${LATEST}cdiff$/
-@$      make-src/Makefile       /^      @$(MAKE) etags "CPPFLAGS=-UVERSION"$/
-@$      make-src/Makefile       /^      @$(MAKE) CHECKOBJS= CHECKFLAGS= etags "CFLAGS=-an/
-@$      make-src/Makefile       /^      @$(MAKE) CHECKOBJS= CHECKFLAGS= ctags "CFLAGS=-an/
-@$      make-src/Makefile       /^      @$(MAKE) etags CHECKOBJS= CHECKFLAGS= REGEXOBJS= /
 A       c.c     162
 A       cp-src/c.C      39
 A       cp-src/c.C      56
@@ -226,9 +210,10 @@ A	cp-src/c.C	73
 A       cp-src/c.C      117
 A       cp-src/fail.C   7
 A       cp-src/fail.C   23
-A       ruby-src/test1.ruby     /^class A$/
+A       ruby-src/test1.ru       /^class A$/
-A       ruby-src/test1.ruby     /^module A$/
+A       ruby-src/test1.ru       /^module A$/
-ABC     ruby-src/test1.ruby     11
+ABC     ruby-src/test1.ru       11
+ADASRC  make-src/Makefile       /^ADASRC=etags-test-for.ada 2ataspri.adb 2ataspri.ad/
 ADDRESS c-src/emacs/src/gmalloc.c       /^#define ADDRESS(B)    ((void *) (((B) - 1) * BLOCKSIZ/
 ALIGNOF_STRUCT_LISP_VECTOR      c-src/emacs/src/lisp.h  1378
 ALLOCATED_BEFORE_DUMPING        c-src/emacs/src/gmalloc.c       /^#define ALLOCATED_BEFORE_DUMPING(P) \\$/
@@ -238,6 +223,7 @@ AND	y-src/cccp.c	11
 ANSIC   c-src/h.h       84
 ANSIC   c-src/h.h       85
 AREF    c-src/emacs/src/lisp.h  /^AREF (Lisp_Object array, ptrdiff_t idx)$/
+ARGS    make-src/Makefile       /^ARGS=- < srclist$/
 ARITH_EQUAL     c-src/emacs/src/lisp.h  3498
 ARITH_GRTR      c-src/emacs/src/lisp.h  3501
 ARITH_GRTR_OR_EQUAL     c-src/emacs/src/lisp.h  3503
@@ -250,6 +236,7 @@ ARRAY_MARK_FLAG	c-src/emacs/src/lisp.h	768
 ASCII_CHAR_P    c-src/emacs/src/lisp.h  /^#define ASCII_CHAR_P(c) UNSIGNED_CMP (c, <, 0x80)$/
 ASET    c-src/emacs/src/lisp.h  /^ASET (Lisp_Object array, ptrdiff_t idx, Lisp_Objec/
 ASIZE   c-src/emacs/src/lisp.h  /^ASIZE (Lisp_Object array)$/
+ASRC    make-src/Makefile       /^ASRC=empty.zz empty.zz.gz$/
 AST_Array::AST_Array    cp-src/c.C      /^AST_Array::AST_Array(UTL_ScopedName *n, unsigned l/
 AST_ConcreteType::AST_ConcreteType      cp-src/c.C      /^AST_ConcreteType::AST_ConcreteType(AST_Decl::NodeT/
 AST_Root        cp-src/c.C      92
@@ -291,7 +278,7 @@ B	cp-src/c.C	/^void B::B() {}$/
 B       cp-src/c.C      122
 B       cp-src/fail.C   8
 B       cp-src/fail.C   24
-B       ruby-src/test1.ruby     /^  class B$/
+B       ruby-src/test1.ru       /^  class B$/
 BE_Node cp-src/c.C      /^void BE_Node::BE_Node() {}$/
 BE_Node cp-src/c.C      77
 BITS_PER_BITS_WORD      c-src/emacs/src/lisp.h  125
@@ -340,7 +327,7 @@ CAR_SAFE	c-src/emacs/src/lisp.h	/^CAR_SAFE (Lisp_Object c)$/
 CATCHER c-src/emacs/src/lisp.h  3021
 CDR     c-src/emacs/src/lisp.h  /^CDR (Lisp_Object c)$/
 CDR_SAFE        c-src/emacs/src/lisp.h  /^CDR_SAFE (Lisp_Object c)$/
-CFLAGS  make-src/Makefile       88
+CFLAGS  make-src/Makefile       /^CFLAGS=${WARNINGS} -ansi -g3 # -pg -O$/
 CHAR    c-src/etags.c   /^#define CHAR(x)               ((unsigned int)(x) & (CHARS - 1))/
 CHAR    y-src/cccp.c    7
 CHARACTERBITS   c-src/emacs/src/lisp.h  2457
@@ -368,7 +355,8 @@ CHAR_TABLE_SET	c-src/emacs/src/lisp.h	/^CHAR_TABLE_SET (Lisp_Object ct, int idx,
 CHAR_TABLE_STANDARD_SLOTS       c-src/emacs/src/lisp.h  1697
 CHAR_TYPE_SIZE  cccp.y  87
 CHAR_TYPE_SIZE  y-src/cccp.y    87
-CHECKEROPTS     make-src/Makefile       92
+CHECKFLAGS      make-src/Makefile       /^CHECKFLAGS=-DDEBUG -Wno-unused-function$/
+CHECKOBJS       make-src/Makefile       /^CHECKOBJS=chkmalloc.o chkxm.o$/
 CHECK_ARRAY     c-src/emacs/src/lisp.h  /^CHECK_ARRAY (Lisp_Object x, Lisp_Object predicate)/
 CHECK_BOOL_VECTOR       c-src/emacs/src/lisp.h  /^CHECK_BOOL_VECTOR (Lisp_Object x)$/
 CHECK_BUFFER    c-src/emacs/src/lisp.h  /^CHECK_BUFFER (Lisp_Object x)$/
@@ -407,6 +395,7 @@ CK_REL_R	parse.y	/^#define CK_REL_R(x)	if(   ((x)>0 && MAX_ROW-(x)<cu/
 CMultiChannelCSC19_3D   cp-src/c.C      2
 CNL     c-src/etags.c   /^#define CNL()                                                         \\$/
 CNL_SAVE_DEFINEDEF      c-src/etags.c   /^#define CNL_SAVE_DEFINEDEF()                                          \\$/
+COBOLFLAGS      make-src/Makefile       /^COBOLFLAGS=--language=none --regex='\/.......[a-zA-/
 COLORS  cp-src/screen.hpp       11
 COMPILEDP       c-src/emacs/src/lisp.h  /^COMPILEDP (Lisp_Object a)$/
 COMPILED_ARGLIST        c-src/emacs/src/lisp.h  2431
@@ -421,10 +410,15 @@ CONSTYPE_HEAP	c-src/emacs/src/lisp.h	3739
 CONSTYPE_PURE   c-src/emacs/src/lisp.h  3739
 CONS_TO_INTEGER c-src/emacs/src/lisp.h  /^#define CONS_TO_INTEGER(cons, type, var)                              \\$/
 CONVERT_CHARSTRING_TO_VALUE     pas-src/common.pas      /^procedure CONVERT_CHARSTRING_TO_VALUE;(*($/
-CPPFLAGS        make-src/Makefile       49
+CPPFLAGS        make-src/Makefile       /^CPPFLAGS=${CHECKFLAGS} -DSTDC_HEADERS -DHAVE_GETCW/
+CPSRC   make-src/Makefile       /^CPSRC=c.C abstract.C abstract.H cfront.H burton.cp/
+CSRC    make-src/Makefile       /^CSRC=abbrev.c ..\/etags\/h.h .\/\/c.c torture.c getopt/
 CTAGS   c-src/etags.c   146
 CTAGS   c-src/etags.c   147
 CTAGS   c-src/etags.c   149
+CTAGS   make-src/Makefile       /^CTAGS: ctags ${infiles}$/
+CTAGS%  make-src/Makefile       /^CTAGS%: ctags% ${infiles}$/
+CTAGS13 CTAGS14 CTAGS15 make-src/Makefile       /^CTAGS13 CTAGS14 CTAGS15: ctags% ${infiles}$/
 CYAN    cp-src/screen.hpp       15
 C_AUTO  c-src/etags.c   2198
 C_EXT   c-src/etags.c   2193
@@ -460,7 +454,7 @@ Condition_Variable/t	ada-src/2ataspri.ads	/^   type Condition_Variable is privat
 Condition_Variable/t    ada-src/2ataspri.ads    /^   type Condition_Variable is$/
 Configure       pyt-src/server.py       /^class Configure(Frame, ControlEdit):$/
 ConfirmQuit     pyt-src/server.py       /^def ConfirmQuit(frame, context):$/
-Constant        ruby-src/test1.ruby     26
+Constant        ruby-src/test1.ru       39
 ControlEdit     pyt-src/server.py       /^class ControlEdit(Frame):$/
 Controls        pyt-src/server.py       /^class Controls:$/
 CopyTextString  pas-src/common.pas      /^function CopyTextString;(*($/
@@ -522,9 +516,11 @@ DOS_NT	c-src/etags.c	117
 DOS_NT  c-src/etags.c   118
 DUMPED  c-src/emacs/src/gmalloc.c       80
 Debug   cp-src/functions.cpp    /^void Debug ( int lineno, int level, char* func , c/
+Def_    ruby-src/test1.ru       12
 DisposeANameList        pas-src/common.pas      /^procedure DisposeANameList( $/
 DisposeNameList pas-src/common.pas      /^procedure DisposeNameList;$/
 ELEM_I  c-src/h.h       3
+ELSRC   make-src/Makefile       /^ELSRC=TAGTEST.EL emacs\/lisp\/progmodes\/etags.el$/
 EMACS_INT       c-src/emacs/src/lisp.h  91
 EMACS_INT       c-src/emacs/src/lisp.h  96
 EMACS_INT       c-src/emacs/src/lisp.h  103
@@ -554,10 +550,16 @@ ENUM_BF	c-src/emacs/src/lisp.h	/^      ENUM_BF (specbind_tag) kind : CHAR_BIT;$/
 ENUM_BF c-src/emacs/src/lisp.h  /^      ENUM_BF (specbind_tag) kind : CHAR_BIT;$/
 EQ      c-src/emacs/src/lisp.h  /^# define EQ(x, y) lisp_h_EQ (x, y)$/
 EQUAL   y-src/cccp.c    12
+ERLSRC  make-src/Makefile       /^ERLSRC=gs_dialog.erl lines.erl lists.erl$/
 ERROR   y-src/parse.y   303
 ERROR   parse.y 303
 ERROR   y-src/cccp.c    9
+ETAGS   make-src/Makefile       /^ETAGS: FRC etags ${infiles}$/
+ETAGS%  make-src/Makefile       /^ETAGS%: FRC etags% ${infiles}$/
+ETAGS12 make-src/Makefile       /^ETAGS12: etags12 ${infiles}$/
+ETAGS13 ETAGS14 ETAGS15 make-src/Makefile       /^ETAGS13 ETAGS14 ETAGS15: etags% ${infiles}$/
 EXFUN   c-src/emacs/src/lisp.h  /^#define EXFUN(fnname, maxargs) \\$/
+EXTAGS  make-src/Makefile       /^EXTAGS: extags ${infiles} Makefile$/
 EXTERNALLY_VISIBLE      c-src/emacs/src/keyboard.c      3497
 EXTERNALLY_VISIBLE      c-src/emacs/src/keyboard.c      4372
 EmptyNmStr      pas-src/common.pas      /^function EmptyNmStr(* : NameString*);$/
@@ -570,8 +572,9 @@ Error_Information/t	ada-src/2ataspri.ads	/^   type Error_Information is new Inte
 Exit_LL_Task/p  ada-src/2ataspri.adb    /^   procedure Exit_LL_Task is$/
 Exit_LL_Task/p  ada-src/2ataspri.ads    /^   procedure Exit_LL_Task;$/
 ExtractCommentInfo      pas-src/common.pas      /^procedure ExtractCommentInfo; (*($/
-FASTCFLAGS      make-src/Makefile       55
+FASTCFLAGS      make-src/Makefile       /^FASTCFLAGS=-O3 -finline-functions -ffast-math -fun/
-FILTER  make-src/Makefile       58
+FASTCFLAGSWARN  make-src/Makefile       /^FASTCFLAGSWARN=${WARNINGS} -Werror ${FASTCFLAGS}$/
+FILTER  make-src/Makefile       /^FILTER=grep -v '\\.[Cchefy][lor]*,[1-9][0-9]*' || t/
 FINALIZERP      c-src/emacs/src/lisp.h  /^FINALIZERP (Lisp_Object x)$/
 FINAL_FREE_BLOCKS       c-src/emacs/src/gmalloc.c       135
 FIXNUM_BITS     c-src/emacs/src/lisp.h  252
@@ -579,10 +582,13 @@ FIXNUM_OVERFLOW_P	c-src/emacs/src/lisp.h	/^#define FIXNUM_OVERFLOW_P(i) \\$/
 FIXNUM_OVERFLOW_P       c-src/emacs/src/lisp.h  /^LISP_MACRO_DEFUN (EQ, bool, (Lisp_Object x, Lisp_O/
 FLOATP  c-src/emacs/src/lisp.h  /^# define FLOATP(x) lisp_h_FLOATP (x)$/
 FLOAT_TO_STRING_BUFSIZE c-src/emacs/src/lisp.h  3927
+FORTHSRC        make-src/Makefile       /^FORTHSRC=test-forth.fth$/
 FOR_EACH_ALIST_VALUE    c-src/emacs/src/lisp.h  /^#define FOR_EACH_ALIST_VALUE(head_var, list_var, v/
 FOR_EACH_TAIL   c-src/emacs/src/lisp.h  /^#define FOR_EACH_TAIL(hare, list, tortoise, n)        \\$/
 FRAMEP  c-src/emacs/src/lisp.h  /^FRAMEP (Lisp_Object a)$/
+FRC     make-src/Makefile       /^FRC:;$/
 FREEFLOOD       c-src/emacs/src/gmalloc.c       1858
+FSRC    make-src/Makefile       /^FSRC=entry.for entry.strange_suffix entry.strange$/
 FUN0    y-src/parse.y   /^yylex FUN0()$/
 FUN0    parse.y /^yylex FUN0()$/
 FUN1    y-src/parse.y   /^yyerror FUN1(char *, s)$/
@@ -653,6 +659,7 @@ GENERIC_PTR	cccp.y	58
 GENERIC_PTR     y-src/cccp.y    56
 GENERIC_PTR     y-src/cccp.y    58
 GEQ     y-src/cccp.c    15
+GETOPTOBJS      make-src/Makefile       /^GETOPTOBJS= #getopt.o getopt1.o$/
 GREEN   cp-src/screen.hpp       14
 GROW_RAW_KEYBUF c-src/emacs/src/keyboard.c      119
 GatherControls  pyt-src/server.py       /^    def GatherControls(self):$/
@@ -674,6 +681,7 @@ HASH_TABLE_SIZE	c-src/emacs/src/lisp.h	/^HASH_TABLE_SIZE (struct Lisp_Hash_Table
 HASH_VALUE      c-src/emacs/src/lisp.h  /^HASH_VALUE (struct Lisp_Hash_Table *h, ptrdiff_t i/
 HAVE_NTGUI      c-src/etags.c   116
 HEAP    c-src/emacs/src/gmalloc.c       131
+HTMLSRC make-src/Makefile       /^HTMLSRC=softwarelibero.html index.shtml algrthms.h/
 HTML_help       c-src/etags.c   584
 HTML_labels     c-src/etags.c   /^HTML_labels (FILE *inf)$/
 HTML_suffixes   c-src/etags.c   582
@@ -729,10 +737,11 @@ IsControlChar	pas-src/common.pas	/^function IsControlChar; (*($/
 IsControlCharName       pas-src/common.pas      /^function IsControlCharName($/
 Is_Set/f        ada-src/2ataspri.adb    /^   function  Is_Set (Cell : in TAS_Cell) return Bo/
 Is_Set/f        ada-src/2ataspri.ads    /^   function  Is_Set       (Cell : in     TAS_Cell)/
+JAVASRC make-src/Makefile       /^JAVASRC=AWTEMul.java KeyEve.java SMan.java SysCol./
 KBD_BUFFER_SIZE c-src/emacs/src/keyboard.c      82
 KBYTES  objc-src/PackInsp.m     58
 KEY_TO_CHAR     c-src/emacs/src/keyboard.c      /^#define KEY_TO_CHAR(k) (XINT (k) & ((1 << CHARACTE/
-LATEST  make-src/Makefile       1
+LATEST  make-src/Makefile       /^LATEST=17$/
 LCE_COMMENT     php-src/lce_functions.php       13
 LCE_COMMENT_TOOL        php-src/lce_functions.php       17
 LCE_COMMENT_USER        php-src/lce_functions.php       15
@@ -742,7 +751,7 @@ LCE_MSGSTR	php-src/lce_functions.php	21
 LCE_TEXT        php-src/lce_functions.php       23
 LCE_UNKNOWN     php-src/lce_functions.php       9
 LCE_WS  php-src/lce_functions.php       11
-LDFLAGS make-src/Makefile       50
+LDFLAGS make-src/Makefile       /^LDFLAGS=#-static -lc_p$/
 LE      y-src/parse.c   7
 LEQ     y-src/cccp.c    14
 LIGHTBLUE       cp-src/screen.hpp       21
@@ -795,6 +804,7 @@ LTGT	cp-src/MDiagArray2.h	35
 LTGT    cp-src/MDiagArray2.h    39
 LTGT    cp-src/MDiagArray2.h    42
 LTGT    cp-src/MDiagArray2.h    144
+LUASRC  make-src/Makefile       /^LUASRC=allegro.lua$/
 L_CELL  y-src/parse.c   10
 L_CONST y-src/parse.c   13
 L_FN0   y-src/parse.c   14
@@ -882,6 +892,8 @@ MAGENTA	cp-src/screen.hpp	17
 MAGICBYTE       c-src/emacs/src/gmalloc.c       1856
 MAGICFREE       c-src/emacs/src/gmalloc.c       1855
 MAGICWORD       c-src/emacs/src/gmalloc.c       1854
+MAKE    make-src/Makefile       /^MAKE:=$(MAKE) --no-print-directory$/
+MAKESRC make-src/Makefile       /^MAKESRC=Makefile$/
 MALLOCFLOOD     c-src/emacs/src/gmalloc.c       1857
 MANY    c-src/emacs/src/lisp.h  2833
 MARKERP c-src/emacs/src/lisp.h  /^# define MARKERP(x) lisp_h_MARKERP (x)$/
@@ -962,7 +974,7 @@ NILP	c-src/emacs/src/lisp.h	/^# define NILP(x) lisp_h_NILP (x)$/
 NIL_IS_ZERO     c-src/emacs/src/lisp.h  1515
 NONPOINTER_BITS c-src/emacs/src/lisp.h  78
 NONPOINTER_BITS c-src/emacs/src/lisp.h  80
-NONSRCS make-src/Makefile       35
+NONSRCS make-src/Makefile       /^NONSRCS=entry.strange lists.erl clheir.hpp.gz$/
 NOTEQUAL        y-src/cccp.c    13
 NULL    cccp.y  51
 NULL    y-src/cccp.y    51
@@ -978,14 +990,22 @@ NewLayerSet	lua-src/allegro.lua	/^function NewLayerSet (name)$/
 NewNameString   pas-src/common.pas      /^procedure NewNameString; (* (var NSP: NameStringPo/
 NmStrToErrStr   pas-src/common.pas      /^function NmStrToErrStr;(*($/
 NmStrToInteger  pas-src/common.pas      /^function NmStrToInteger; (* (Str : NameString) : i/
+OBJCPPSRC       make-src/Makefile       /^OBJCPPSRC=SimpleCalc.H SimpleCalc.M$/
+OBJCSRC make-src/Makefile       /^OBJCSRC=Subprocess.h Subprocess.m PackInsp.h PackI/
+OBJS    make-src/Makefile       /^OBJS=${GETOPTOBJS} ${REGEXOBJS} ${CHECKOBJS}$/
 OPENBUTTON      objc-src/PackInsp.m     47
+OPTIONS make-src/Makefile       /^OPTIONS=--members --declarations --regex=@regexfil/
 OR      y-src/cccp.c    10
+OTAGS   make-src/Makefile       /^OTAGS: oetags ${SRCS} srclist$/
 OVERLAYP        c-src/emacs/src/lisp.h  /^OVERLAYP (Lisp_Object x)$/
 Objc_help       c-src/etags.c   613
 Objc_suffixes   c-src/etags.c   609
 OperatorFun     c-src/h.h       88
 Overview        tex-src/gzip.texi       /^@node Overview, Sample, Copying, Top$/
+PASSRC  make-src/Makefile       /^PASSRC=common.pas$/
 PDT     c-src/h.h       /^  Date 04 May 87 235311 PDT (Mon)$/
+PERLSRC make-src/Makefile       /^PERLSRC=htlmify-cystic yagrip.pl kai-test.pl mirro/
+PHPSRC  make-src/Makefile       /^PHPSRC=lce_functions.php ptest.php sendmail.php$/
 PHP_functions   c-src/etags.c   /^PHP_functions (FILE *inf)$/
 PHP_help        c-src/etags.c   639
 PHP_suffixes    c-src/etags.c   637
@@ -996,8 +1016,10 @@ PORManager	php-src/lce_functions.php	498
 PORManager      php-src/lce_functions.php       /^      function PORManager()$/
 POReader        php-src/lce_functions.php       163
 POReader        php-src/lce_functions.php       /^      function POReader($domain, $filename)$/
+POSTSCRIPTFLAGS make-src/Makefile       /^POSTSCRIPTFLAGS=--language=none --regex='#\/[^ \\t{]/
 PRINT_UNDOCUMENTED_OPTIONS_HELP c-src/etags.c   804
 PROCESSP        c-src/emacs/src/lisp.h  /^PROCESSP (Lisp_Object a)$/
+PROLSRC make-src/Makefile       /^PROLSRC=ordsets.prolog natded.prolog$/
 PROP    c-src/emacs/src/keyboard.c      /^#define PROP(IDX) AREF (tool_bar_item_properties, /
 PROP    c-src/emacs/src/keyboard.c      8379
 PROTECT_MALLOC_STATE    c-src/emacs/src/gmalloc.c       /^#define PROTECT_MALLOC_STATE(PROT) protect_malloc_/
@@ -1015,6 +1037,7 @@ PSEUDOVECTOR_REST_MASK	c-src/emacs/src/lisp.h	814
 PSEUDOVECTOR_SIZE_BITS  c-src/emacs/src/lisp.h  808
 PSEUDOVECTOR_SIZE_MASK  c-src/emacs/src/lisp.h  809
 PSEUDOVECTOR_TYPEP      c-src/emacs/src/lisp.h  /^PSEUDOVECTOR_TYPEP (struct vectorlike_header *a, i/
+PSSRC   make-src/Makefile       /^PSSRC=rfc1245.ps$/
 PS_functions    c-src/etags.c   /^PS_functions (FILE *inf)$/
 PS_help c-src/etags.c   649
 PS_suffixes     c-src/etags.c   647
@@ -1039,6 +1062,7 @@ PVEC_TERMINAL	c-src/emacs/src/lisp.h	790
 PVEC_TYPE_MASK  c-src/emacs/src/lisp.h  819
 PVEC_WINDOW     c-src/emacs/src/lisp.h  786
 PVEC_WINDOW_CONFIGURATION       c-src/emacs/src/lisp.h  791
+PYTSRC  make-src/Makefile       /^PYTSRC=server.py$/
 PackageInspector        objc-src/PackInsp.h     /^@interface PackageInspector:WMInspector$/
 Pascal_functions        c-src/etags.c   /^Pascal_functions (FILE *inf)$/
 Pascal_help     c-src/etags.c   621
@@ -1133,6 +1157,8 @@ RECC_UPPER	c-src/emacs/src/regex.h	612
 RECC_WORD       c-src/emacs/src/regex.h 610
 RECC_XDIGIT     c-src/emacs/src/regex.h 614
 RED     cp-src/screen.hpp       16
+REGEX   make-src/Makefile       /^REGEX=\/[ \\t]*DEFVAR_[A-Z_ \\t\\n(]+"\\([^"]+\\)"\/$/
+REGEXOBJS       make-src/Makefile       /^REGEXOBJS=regex.o$/
 REGS_FIXED      c-src/emacs/src/regex.h 378
 REGS_REALLOCATE c-src/emacs/src/regex.h 377
 REGS_UNALLOCATED        c-src/emacs/src/regex.h 376
@@ -1162,6 +1188,7 @@ REG_NOMATCH	c-src/emacs/src/regex.h	301
 REG_NOSUB       c-src/emacs/src/regex.h 276
 REG_NOTBOL      c-src/emacs/src/regex.h 286
 REG_NOTEOL      c-src/emacs/src/regex.h 289
+RELEASELIST     make-src/Makefile       /^RELEASELIST=pot@gnu.org xemacs-review@xemacs.org j/
 RESUME_POLLING  c-src/emacs/src/keyboard.c      2170
 RETURN_UNGCPRO  c-src/emacs/src/lisp.h  /^#define RETURN_UNGCPRO(expr)                  \\$/
 RE_BACKSLASH_ESCAPE_IN_LISTS    c-src/emacs/src/regex.h 47
@@ -1207,6 +1234,9 @@ RE_TRANSLATE_TYPE	c-src/emacs/src/regex.h	332
 RE_UNMATCHED_RIGHT_PAREN_ORD    c-src/emacs/src/regex.h 136
 RSH     y-src/cccp.c    17
 RTE/s   ada-src/2ataspri.adb    /^   package RTE renames Interfaces.C.POSIX_RTE;$/
+RUN     make-src/Makefile       /^RUN=time --quiet --format '%U + %S: %E'$/
+RUN     make-src/Makefile       /^RUN=$/
+RXINCLUDE       make-src/Makefile       /^RXINCLUDE=-Iemacs\/src$/
 Range   cp-src/Range.h  35
 Range   cp-src/Range.h  /^  Range (void)$/
 Range   cp-src/Range.h  /^  Range (const Range& r)$/
@@ -1274,6 +1304,7 @@ SPECPDL_UNWIND	c-src/emacs/src/lisp.h	2944
 SPECPDL_UNWIND_INT      c-src/emacs/src/lisp.h  2946
 SPECPDL_UNWIND_PTR      c-src/emacs/src/lisp.h  2945
 SPECPDL_UNWIND_VOID     c-src/emacs/src/lisp.h  2947
+SRCS    make-src/Makefile       /^SRCS=Makefile ${ADASRC} ${ASRC} ${CSRC} ${CPSRC} $/
 SREF    c-src/emacs/src/lisp.h  /^SREF (Lisp_Object string, ptrdiff_t index)$/
 SSDATA  c-src/emacs/src/lisp.h  /^SSDATA (Lisp_Object string)$/
 SSET    c-src/emacs/src/lisp.h  /^SSET (Lisp_Object string, ptrdiff_t index, unsigne/
@@ -1343,15 +1374,16 @@ System.Task_Primitives/s	ada-src/2ataspri.ads	/^package System.Task_Primitives i
 T       cp-src/fail.C   14
 T2      cp-src/fail.C   16
 T3      c.c     163
+TAGS    make-src/Makefile       /^TAGS: etags.c$/
 TAG_PTR c-src/emacs/src/lisp.h  /^#define TAG_PTR(tag, ptr) \\$/
 TAG_SYMOFFSET   c-src/emacs/src/lisp.h  /^#define TAG_SYMOFFSET(offset)                             \\$/
 TAS_Cell/t      ada-src/2ataspri.ads    /^   type TAS_Cell is private;$/
 TAS_Cell/t      ada-src/2ataspri.ads    /^   type TAS_Cell is$/
 TCB_Ptr/t       ada-src/2ataspri.ads    /^   type TCB_Ptr is access all Task_Control_Block;$/
+TCLFLAGS        make-src/Makefile       /^TCLFLAGS=--lang=none --regex='\/proc[ \\t]+\\([^ \\t]+/
 TERMINALP       c-src/emacs/src/lisp.h  /^TERMINALP (Lisp_Object a)$/
 TEST    php-src/ptest.php       1
-TEXTAGS make-src/Makefile       204
+TEXSRC  make-src/Makefile       /^TEXSRC=testenv.tex gzip.texi texinfo.tex nonewline/
-TEXTAGS make-src/Makefile       219
 TEX_LESC        c-src/etags.c   4986
 TEX_SESC        c-src/etags.c   4987
 TEX_clgrp       c-src/etags.c   4922
@@ -1433,6 +1465,7 @@ VECTORP	c-src/emacs/src/lisp.h	/^VECTORP (Lisp_Object x)$/
 VERSION c-src/etags.c   789
 VERSION erl-src/gs_dialog.erl   /^-define(VERSION, '2001.1101').$/
 VERSION objc-src/PackInsp.m     34
+VHDLFLAGS       make-src/Makefile       /^VHDLFLAGS=--language=none --regex='\/[ \\t]*\\(ARCHIT/
 Vabbrev_start_location  c-src/abbrev.c  63
 Vabbrev_start_location_buffer   c-src/abbrev.c  66
 Vabbrev_table_name_list c-src/abbrev.c  43
@@ -1445,6 +1478,7 @@ Vlispy_mouse_stem	c-src/emacs/src/keyboard.c	5172
 Vpre_abbrev_expand_hook c-src/abbrev.c  83
 WAIT_READING_MAX        c-src/emacs/src/lisp.h  4281
 WAIT_READING_MAX        c-src/emacs/src/lisp.h  4283
+WARNINGS        make-src/Makefile       /^WARNINGS=-pedantic -Wall -Wpointer-arith -Winline /
 WCHAR_TYPE_SIZE cccp.y  99
 WCHAR_TYPE_SIZE y-src/cccp.y    99
 WHITE   cp-src/screen.hpp       27
@@ -1457,6 +1491,7 @@ WorkingDays	cp-src/functions.cpp	/^int WorkingDays(Date a, Date b){$/
 Write_Lock/p    ada-src/2ataspri.adb    /^   procedure Write_Lock (L : in out Lock; Ceiling_/
 Write_Lock/p    ada-src/2ataspri.ads    /^   procedure Write_Lock (L : in out Lock; Ceiling_/
 X       c-src/h.h       100
+X       ruby-src/test1.ru       /^    def X$/
 XBOOL_VECTOR    c-src/emacs/src/lisp.h  /^XBOOL_VECTOR (Lisp_Object a)$/
 XBUFFER c-src/emacs/src/lisp.h  /^XBUFFER (Lisp_Object a)$/
 XBUFFER_OBJFWD  c-src/emacs/src/lisp.h  /^XBUFFER_OBJFWD (union Lisp_Fwd *a)$/
@@ -1534,9 +1569,11 @@ XUNTAG	c-src/emacs/src/lisp.h	/^#  define XUNTAG(a, type) lisp_h_XUNTAG (a, type
 XUNTAG  c-src/emacs/src/lisp.h  /^XUNTAG (Lisp_Object a, int type)$/
 XWINDOW c-src/emacs/src/lisp.h  /^XWINDOW (Lisp_Object a)$/
 XX      cp-src/x.cc     1
+Xyzzy   ruby-src/test1.ru       13
 Y       c-src/h.h       100
 YACC    c-src/etags.c   2199
 YELLOW  cp-src/screen.hpp       26
+YSRC    make-src/Makefile       /^YSRC=parse.y parse.c atest.y cccp.c cccp.y$/
 YYABORT /usr/share/bison/bison.simple   153
 YYABORT /usr/share/bison/bison.simple   154
 YYACCEPT        /usr/share/bison/bison.simple   152
@@ -2359,7 +2396,7 @@ __str__	pyt-src/server.py	/^    def __str__(self):$/
 __up    c.c     160
 _aligned_blocks c-src/emacs/src/gmalloc.c       1004
 _aligned_blocks_mutex   c-src/emacs/src/gmalloc.c       518
-_bar?   ruby-src/test1.ruby     /^    def self._bar?(abc)$/
+_bar?   ruby-src/test1.ru       /^    def self._bar?(abc)$/
 _bytes_free     c-src/emacs/src/gmalloc.c       376
 _bytes_used     c-src/emacs/src/gmalloc.c       374
 _chunks_free    c-src/emacs/src/gmalloc.c       375
@@ -2388,7 +2425,7 @@ a	c.c	/^a ()$/
 a       c-src/h.h       40
 a       c-src/h.h       103
 a       cp-src/c.C      132
-a       ruby-src/test1.ruby     /^ def a()$/
+a       ruby-src/test1.ru       /^ def a()$/
 a-forth-constant!       forth-src/test-forth.fth        /^99 constant a-forth-constant!$/
 a-forth-value?  forth-src/test-forth.fth        /^55 value a-forth-value?$/
 a-forth-word    forth-src/test-forth.fth        /^: a-forth-word ( a b c -- a*b+c )  + * ;$/
@@ -2513,16 +2550,18 @@ b	c-src/h.h	41
 b       c-src/h.h       103
 b       c-src/h.h       104
 b       cp-src/c.C      132
-b       ruby-src/test1.ruby     /^ def b()$/
+b       ruby-src/test1.ru       /^ def b()$/
 backslash=0     tex-src/texinfo.tex     /^\\let\\indexbackslash=0  %overridden during \\printin/
 bar     c-src/c.c       /^void bar() {while(0) {}}$/
 bar     c.c     143
 bar     c-src/h.h       19
 bar     cp-src/x.cc     /^XX::bar()$/
+bar=    ruby-src/test1.ru       /^      attr_writer :bar,$/
 bas_syn prol-src/natded.prolog  /^bas_syn(n(_)).$/
 base    c-src/emacs/src/lisp.h  2188
 base    cp-src/c.C      /^double base (void) const { return rng_base;  }$/
 base    cp-src/Range.h  /^  double base (void) const { return rng_base;  }$/
+baz=    ruby-src/test1.ru       /^                  :baz,$/
 bb      c.c     275
 bbb     c.c     251
 bbbbbb  c-src/h.h       113
@@ -2593,7 +2632,6 @@ bytes_used	c-src/emacs/src/gmalloc.c	312
 c       c.c     180
 c       c-src/h.h       /^#define c() d$/
 c       c-src/h.h       106
-c       make-src/Makefile       222
 c_ext   c-src/etags.c   2271
 caccacacca      c.c     /^caccacacca (a,b,c,d,e,f,g)$/
 cacheLRUEntry_s c.c     172
@@ -2623,6 +2661,7 @@ charset_unibyte	c-src/emacs/src/regex.h	410
 chartonmstr     pas-src/common.pas      /^function chartonmstr; (*($/
 checkQuotation  php-src/lce_functions.php       /^      function checkQuotation($str)$/
 check_cons_list c-src/emacs/src/lisp.h  /^#  define check_cons_list() lisp_h_check_cons_list/
+checker make-src/Makefile       /^checker:$/
 checkhdr        c-src/emacs/src/gmalloc.c       /^checkhdr (const struct hdr *hdr)$/
 checkiso        html-src/software.html  /^checkiso$/
 childDidExit    objc-src/Subprocess.m   /^- childDidExit$/
@@ -2631,6 +2670,7 @@ chunks_used	c-src/emacs/src/gmalloc.c	311
 cjava   c-src/etags.c   2936
 class_method    ruby-src/test.rb        /^        def ClassExample.class_method$/
 classifyLine    php-src/lce_functions.php       /^      function classifyLine($line)$/
+clean   make-src/Makefile       /^clean:$/
 clear   cp-src/conway.hpp       /^    void clear(void) { alive = 0; }$/
 clear-abbrev-table      c-src/abbrev.c  /^DEFUN ("clear-abbrev-table", Fclear_abbrev_table, /
 clear-this-command-keys c-src/emacs/src/keyboard.c      /^DEFUN ("clear-this-command-keys", Fclear_this_comm/
@@ -2691,6 +2731,7 @@ createWidgets	pyt-src/server.py	/^    def createWidgets(self):$/
 cscInitTime     cp-src/c.C      7
 cscSegmentationTime     cp-src/c.C      8
 cstack  c-src/etags.c   2523
+ctags   make-src/Makefile       /^ctags: etags.c ${OBJS}$/
 curlb   c-src/etags.c   2929
 curlinepos      c-src/etags.c   2931
 current-idle-time       c-src/emacs/src/keyboard.c      /^DEFUN ("current-idle-time", Fcurrent_idle_time, Sc/
@@ -2828,6 +2869,7 @@ error	y-src/cccp.y	/^error (msg)$/
 error_signaled  c-src/etags.c   264
 etags   el-src/emacs/lisp/progmodes/etags.el    /^(defgroup etags nil "Tags tables."$/
 etags   html-src/software.html  /^Etags$/
+etags   make-src/Makefile       /^etags: etags.c ${OBJS}$/
 etags--xref-find-definitions    el-src/emacs/lisp/progmodes/etags.el    /^(defun etags--xref-find-definitions (pattern &opti/
 etags--xref-limit       el-src/emacs/lisp/progmodes/etags.el    /^(defconst etags--xref-limit 1000)$/
 etags-file-of-tag       el-src/emacs/lisp/progmodes/etags.el    /^(defun etags-file-of-tag (&optional relative) ; Do/
@@ -2843,6 +2885,7 @@ etags-tags-table-files	el-src/emacs/lisp/progmodes/etags.el	/^(defun etags-tags-
 etags-verify-tags-table el-src/emacs/lisp/progmodes/etags.el    /^(defun etags-verify-tags-table ()$/
 etags-xref-find el-src/emacs/lisp/progmodes/etags.el    /^(defun etags-xref-find (action id)$/
 etags-xref-find-definitions-tag-order   el-src/emacs/lisp/progmodes/etags.el    /^(defvar etags-xref-find-definitions-tag-order '(ta/
+etags.1.man     make-src/Makefile       /^etags.1.man: etags.1$/
 etags_getcwd    c-src/etags.c   /^etags_getcwd (void)$/
 eval_dyn        c-src/emacs/src/keyboard.c      /^eval_dyn (Lisp_Object form)$/
 event-convert-list      c-src/emacs/src/keyboard.c      /^DEFUN ("event-convert-list", Fevent_convert_list, /
@@ -2890,6 +2933,8 @@ f	cp-src/fail.C	/^int A::B::f() { return 2; }$/
 f1      c.c     /^     f1 () { \/* Do something. *\/; }$/
 f2      c.c     /^void f2 () { \/* Do something. *\/; }$/
 fast_string_match_ignore_case   c-src/emacs/src/lisp.h  /^fast_string_match_ignore_case (Lisp_Object regexp,/
+fastctags       make-src/Makefile       /^fastctags:$/
+fastetags       make-src/Makefile       /^fastetags:$/
 fastmap c-src/emacs/src/regex.h 355
 fastmap_accurate        c-src/emacs/src/regex.h 383
 fatal   c-src/etags.c   /^fatal (const char *s1, const char *s2)$/
@@ -2962,7 +3007,8 @@ foo	f-src/entry.for	/^       character*(*) function foo()$/
 foo     f-src/entry.strange_suffix      /^       character*(*) function foo()$/
 foo     f-src/entry.strange     /^       character*(*) function foo()$/
 foo     php-src/ptest.php       /^foo()$/
-foo!    ruby-src/test1.ruby     /^    def foo!$/
+foo     ruby-src/test1.ru       /^      attr_reader :foo$/
+foo!    ruby-src/test1.ru       /^    def foo!$/
 foobar  c-src/c.c       /^int foobar() {;}$/
 foobar  c.c     /^extern void foobar (void) __attribute__ ((section /
 foobar2 c-src/h.h       20
@@ -3037,6 +3083,8 @@ get_layer_by_name	lua-src/allegro.lua	/^local function get_layer_by_name (sprite
 get_tag c-src/etags.c   /^get_tag (register char *bp, char **namepp)$/
 get_word        c-src/tab.c     /^static char           *get_word(char **str, char delim)$/
 getcjmp c-src/emacs/src/keyboard.c      147
+getopt.o        make-src/Makefile       /^getopt.o: emacs\/lib-src\/getopt.c$/
+getopt1.o       make-src/Makefile       /^getopt1.o: emacs\/lib-src\/getopt1.c$/
 getptys objc-src/Subprocess.m   /^getptys (int *master, int *slave)$/
 gettext php-src/lce_functions.php       /^      function gettext($msgid)$/
 ggg     c-src/h.h       10
@@ -3109,6 +3157,7 @@ inc	cp-src/Range.h	/^  double inc (void) const { return rng_inc;   }$/
 index   c-src/emacs/src/lisp.h  1856
 infabsdir       c-src/etags.c   206
 infabsname      c-src/etags.c   205
+infiles make-src/Makefile       /^infiles = $(filter-out ${NONSRCS},${SRCS}) srclist/
 infname c-src/etags.c   204
 info    c-src/emacs/src/gmalloc.c       157
 infoPanel       objcpp-src/SimpleCalc.M /^- infoPanel:sender$/
@@ -3385,6 +3434,7 @@ main::section_url_base	perl-src/htlmify-cystic	/^sub section_url_base ()$/
 main::section_url_name  perl-src/htlmify-cystic /^sub section_url_name ()$/
 main::toc_line  perl-src/htlmify-cystic /^sub toc_line ($)$/
 main::usage     perl-src/yagrip.pl      /^sub usage {$/
+maintaining.info        make-src/Makefile       /^maintaining.info: maintaining.texi$/
 make-abbrev-table       c-src/abbrev.c  /^DEFUN ("make-abbrev-table", Fmake_abbrev_table, Sm/
 make_C_tag      c-src/etags.c   /^make_C_tag (bool isfun)$/
 make_coor       prol-src/natded.prolog  /^make_coor(s(_),Alpha,Sem1,Sem2,Alpha@Sem1@Sem2).$/
@@ -3417,6 +3467,7 @@ malloc_enable_thread	c-src/emacs/src/gmalloc.c	/^malloc_enable_thread (void)$/
 malloc_info     c-src/emacs/src/gmalloc.c       167
 malloc_initialize_1     c-src/emacs/src/gmalloc.c       /^malloc_initialize_1 (void)$/
 mallochook      c-src/emacs/src/gmalloc.c       /^mallochook (size_t size)$/
+man manpage     make-src/Makefile       /^man manpage: etags.1.man$/
 mao     c-src/h.h       101
 map     c-src/emacs/src/keyboard.c      8748
 map_word        prol-src/natded.prolog  /^map_word([[_]|Ws],Exp):-$/
@@ -3464,6 +3515,7 @@ modifier_symbols	c-src/emacs/src/keyboard.c	6327
 modify_event_symbol     c-src/emacs/src/keyboard.c      /^modify_event_symbol (ptrdiff_t symbol_num, int mod/
 module_class_method     ruby-src/test.rb        /^    def ModuleExample.module_class_method$/
 module_instance_method  ruby-src/test.rb        /^    def module_instance_method$/
+more=   ruby-src/test1.ru       /^                  :more$/
 more_aligned_int        c.c     165
 morecore_nolock c-src/emacs/src/gmalloc.c       /^morecore_nolock (size_t size)$/
 morecore_recursing      c-src/emacs/src/gmalloc.c       604
@@ -3619,6 +3671,7 @@ obstack_chunk_free	parse.y	47
 ocatseen        c-src/etags.c   2477
 octave_MDiagArray2_h    cp-src/MDiagArray2.h    29
 octave_Range_h  cp-src/Range.h  24
+oediff  make-src/Makefile       /^oediff: OTAGS ETAGS ${infiles}$/
 offset  c-src/etags.c   2494
 offset  c-src/emacs/src/lisp.h  2305
 offset  c-src/emacs/src/lisp.h  2365
@@ -3810,6 +3863,7 @@ process_file_name	c-src/etags.c	/^process_file_name (char *file, language *lang)
 process_pending_signals c-src/emacs/src/keyboard.c      /^process_pending_signals (void)$/
 process_special_events  c-src/emacs/src/keyboard.c      /^process_special_events (void)$/
 process_tool_bar_item   c-src/emacs/src/keyboard.c      /^process_tool_bar_item (Lisp_Object key, Lisp_Objec/
+prof    make-src/Makefile       /^prof: ETAGS$/
 prolog_atom     c-src/etags.c   /^prolog_atom (char *s, size_t pos)$/
 prolog_pr       c-src/etags.c   /^prolog_pr (char *s, char *last)$/
 prolog_skip_comment     c-src/etags.c   /^prolog_skip_comment (linebuffer *plb, FILE *inf)$/
@@ -3824,9 +3878,11 @@ put_entries	c-src/etags.c	/^put_entries (register node *np)$/
 pvec_type       c-src/emacs/src/lisp.h  780
 quantizing      html-src/algrthms.html  /^Quantizing the Received$/
 questo  ../c/c.web      34
+quiettest       make-src/Makefile       /^quiettest:$/
 quit_char       c-src/emacs/src/keyboard.c      192
 quit_throw_to_read_char c-src/emacs/src/keyboard.c      /^quit_throw_to_read_char (bool from_signal)$/
-qux=    ruby-src/test1.ruby     /^      def qux=(tee)$/
+qux     ruby-src/test1.ru       /^      alias_method :qux, :tee, attr_accessor :bogu/
+qux=    ruby-src/test1.ru       /^      def qux=(tee)$/
 r0      c-src/sysdep.h  54
 r1      c-src/sysdep.h  55
 r_alloc c-src/emacs/src/lisp.h  /^extern void *r_alloc (void **, size_t) ATTRIBUTE_A/
@@ -3850,6 +3906,8 @@ read	cp-src/conway.hpp	/^    char read() { return alive; }$/
 read    php-src/lce_functions.php       /^      function read()$/
 read-key-sequence       c-src/emacs/src/keyboard.c      /^DEFUN ("read-key-sequence", Fread_key_sequence, Sr/
 read-key-sequence-vector        c-src/emacs/src/keyboard.c      /^DEFUN ("read-key-sequence-vector", Fread_key_seque/
+read1   ruby-src/test1.ru       /^      attr_reader :read1 , :read2; attr_writer :wr/
+read2   ruby-src/test1.ru       /^      attr_reader :read1 , :read2; attr_writer :wr/
 read_char       c-src/emacs/src/keyboard.c      /^read_char (int commandflag, Lisp_Object map,$/
 read_char_help_form_unwind      c-src/emacs/src/keyboard.c      /^read_char_help_form_unwind (void)$/
 read_char_minibuf_menu_prompt   c-src/emacs/src/keyboard.c      /^read_char_minibuf_menu_prompt (int commandflag,$/
@@ -3890,13 +3948,10 @@ reg_errcode_t	c.c	279
 reg_errcode_t   c-src/emacs/src/regex.h 323
 reg_syntax_t    c-src/emacs/src/regex.h 43
 regex   c-src/etags.c   219
-regex   make-src/Makefile       204
+regex.o make-src/Makefile       /^regex.o: emacs\/src\/regex.c$/
-regex   make-src/Makefile       207
-regex   make-src/Makefile       213
-regex   make-src/Makefile       216
-regex   make-src/Makefile       219
 regex_t c-src/emacs/src/regex.h 416
 regex_tag_multiline     c-src/etags.c   /^regex_tag_multiline (void)$/
+regexfile       make-src/Makefile       /^regexfile: Makefile$/
 regexp  c-src/etags.c   256
 regexp  c-src/etags.c   268
 registerAction  objcpp-src/SimpleCalc.M /^- registerAction:(SEL)action$/
@@ -3911,6 +3966,7 @@ regular_top_level_message	c-src/emacs/src/keyboard.c	143
 rehash_size     c-src/emacs/src/lisp.h  1835
 rehash_threshold        c-src/emacs/src/lisp.h  1839
 relative_filename       c-src/etags.c   /^relative_filename (char *file, char *dir)$/
+release distrib make-src/Makefile       /^release distrib: web$/
 removeexp       prol-src/natded.prolog  /^removeexp(E,E,'NIL'):-!.$/
 reorder_modifiers       c-src/emacs/src/keyboard.c      /^reorder_modifiers (Lisp_Object symbol)$/
 request c.c     /^request request (a, b)$/
@@ -3934,6 +3990,8 @@ rng_inc	cp-src/Range.h	81
 rng_limit       cp-src/Range.h  80
 rng_nelem       cp-src/Range.h  83
 rosso   cp-src/c.C      40
+rsyncfromfly    make-src/Makefile       /^rsyncfromfly:$/
+rsynctofly      make-src/Makefile       /^rsynctofly:$/
 rtint   c-src/h.h       60
 rtint   c-src/h.h       68
 rtstr   c-src/h.h       61
@@ -4049,6 +4107,7 @@ specbind_tag	c-src/emacs/src/lisp.h	2943
 specbinding     c-src/emacs/src/lisp.h  2955
 specialsymbol   prol-src/natded.prolog  /^specialsymbol(C1,C2,S):-$/
 splitexp        prol-src/natded.prolog  /^splitexp(E,E,('NIL','NIL')):-!.$/
+srclist make-src/Makefile       /^srclist: Makefile$/
 ss3     c.c     255
 sss1    c.c     252
 sss2    c.c     253
@@ -4071,6 +4130,7 @@ st_C_typedef	c-src/etags.c	2213
 st_none c-src/etags.c   2206
 stack   c.c     155
 stagseen        c-src/etags.c   2446
+standalone      make-src/Makefile       /^standalone:$/
 start   c-src/emacs/src/regex.h 431
 start   c-src/emacs/src/keyboard.c      8753
 start   php-src/lce_functions.php       /^      function start($line, $class)$/
@@ -4079,6 +4139,7 @@ start_polling	c-src/emacs/src/keyboard.c	/^start_polling (void)$/
 start_up        prol-src/natded.prolog  /^start_up:-$/
 state_protected_p       c-src/emacs/src/gmalloc.c       400
 statetable      html-src/algrthms.html  /^Next$/
+staticetags     make-src/Makefile       /^staticetags:$/
 step    cp-src/conway.hpp       /^    void step(void) { alive = next_alive; }$/
 step    cp-src/clheir.hpp       /^    virtual void step(void) { }$/
 step_everybody  cp-src/clheir.cpp       /^void step_everybody(void)$/
@@ -4105,6 +4166,7 @@ substitute	c-src/etags.c	/^substitute (char *in, char *out, struct re_registe/
 subsubsec=\relax        tex-src/texinfo.tex     /^\\let\\appendixsubsubsec=\\relax$/
 subsubsection   perl-src/htlmify-cystic 27
 subsubsection=\relax    tex-src/texinfo.tex     /^\\let\\appendixsubsubsection=\\relax$/
+subtle  ruby-src/test1.ru       /^                   :tee ; attr_reader :subtle$/
 subtree prol-src/natded.prolog  /^subtree(T,T).$/
 suffix  c-src/etags.c   186
 suffixes        c-src/etags.c   195
@@ -4168,6 +4230,7 @@ tag6	c-src/torture.c	/^tag6 (void (*handler) (void *), void *arg)$/
 tag6    c-src/dostorture.c      /^tag6 (void (*handler) (void *), void *arg)$/
 tag_or_ch       c-src/emacs/src/lisp.h  3026
 taggedfname     c-src/etags.c   207
+tags    make-src/Makefile       /^tags: TAGS$/
 tags-add-tables el-src/emacs/lisp/progmodes/etags.el    /^(defcustom tags-add-tables 'ask-user$/
 tags-apropos    el-src/emacs/lisp/progmodes/etags.el    /^(defun tags-apropos (regexp)$/
 tags-apropos-additional-actions el-src/emacs/lisp/progmodes/etags.el    /^(defcustom tags-apropos-additional-actions nil$/
@@ -4220,6 +4283,8 @@ tags-with-face	el-src/emacs/lisp/progmodes/etags.el	/^(defmacro tags-with-face (
 target_multibyte        c-src/emacs/src/regex.h 407
 tcpdump html-src/software.html  /^tcpdump$/
 teats   cp-src/c.C      127
+tee     ruby-src/test1.ru       /^      attr_accessor :tee$/
+tee=    ruby-src/test1.ru       /^      attr_accessor :tee$/
 temporarily_switch_to_single_kboard     c-src/emacs/src/keyboard.c      /^temporarily_switch_to_single_kboard (struct frame /
 tend    c-src/etags.c   2432
 terminate       objc-src/Subprocess.m   /^- terminate:sender$/
@@ -4228,6 +4293,7 @@ test	c-src/emacs/src/lisp.h	1871
 test    cp-src/c.C      86
 test    erl-src/gs_dialog.erl   /^test() ->$/
 test    go-src/test1.go /^func test(p plus) {$/
+test    make-src/Makefile       /^test:$/
 test    php-src/ptest.php       /^test $/
 test.me22b      lua-src/test.lua        /^   local function test.me22b (one)$/
 test.me_22a     lua-src/test.lua        /^   function test.me_22a(one, two)$/
@@ -4374,15 +4440,12 @@ warning	cccp.y	/^warning (msg)$/
 warning y-src/cccp.y    /^warning (msg)$/
 weak    c-src/emacs/src/lisp.h  1830
 weak_alias      c-src/emacs/src/gmalloc.c       /^weak_alias (free, cfree)$/
+web ftp publish make-src/Makefile       /^web ftp publish:$/
 what    c-src/etags.c   252
 wheel_syms      c-src/emacs/src/keyboard.c      4628
 where   c-src/emacs/src/lisp.h  2348
 where   cp-src/clheir.hpp       77
 where_in_registry       cp-src/clheir.hpp       15
-width   make-src/Makefile       186
-width   make-src/Makefile       189
-width   make-src/Makefile       192
-width   make-src/Makefile       195
 windowWillClose objcpp-src/SimpleCalc.M /^- windowWillClose:sender$/
 wipe_kboard     c-src/emacs/src/keyboard.c      /^wipe_kboard (KBOARD *kb)$/
 womboid c-src/h.h       63
@@ -4390,6 +4453,8 @@ womboid	c-src/h.h	75
 word_size       c-src/emacs/src/lisp.h  1473
 write   php-src/lce_functions.php       /^      function write()$/
 write   php-src/lce_functions.php       /^      function write($save="yes")$/
+write1= ruby-src/test1.ru       /^      attr_reader :read1 , :read2; attr_writer :wr/
+write2= ruby-src/test1.ru       /^      attr_reader :read1 , :read2; attr_writer :wr/
 write_abbrev    c-src/abbrev.c  /^write_abbrev (sym, stream)$/
 write_classname c-src/etags.c   /^write_classname (linebuffer *cn, const char *quali/
 write_lex       prol-src/natded.prolog  /^write_lex(File):-$/
@@ -4420,6 +4485,7 @@ x-get-selection-internal	c.c	/^DEFUN ("x-get-selection-internal", Fx_get_selecti
 x-get-selection-internal        c.c     /^       Fx_get_selection_internal, Sx_get_selection/
 xcar_addr       c-src/emacs/src/lisp.h  /^xcar_addr (Lisp_Object c)$/
 xcdr_addr       c-src/emacs/src/lisp.h  /^xcdr_addr (Lisp_Object c)$/
+xdiff   make-src/Makefile       /^xdiff: ETAGS EXTAGS ${infiles}$/
 xmalloc c-src/etags.c   /^xmalloc (size_t size)$/
 xnew    c-src/etags.c   /^#define xnew(n, Type)      ((Type *) xmalloc ((n) /
 xrealloc        c-src/etags.c   /^xrealloc (void *ptr, size_t size)$/
@@ -4428,6 +4494,8 @@ xref-location-line	el-src/emacs/lisp/progmodes/etags.el	/^(cl-defmethod xref-loc
 xref-location-marker    el-src/emacs/lisp/progmodes/etags.el    /^(cl-defmethod xref-location-marker ((l xref-etags-/
 xref-make-etags-location        el-src/emacs/lisp/progmodes/etags.el    /^(defun xref-make-etags-location (tag-info file)$/
 xrnew   c-src/etags.c   /^#define xrnew(op, n, Type) ((op) = (Type *) xreall/
+xx      make-src/Makefile       /^xx="this line is here because of a fontlock bug$/
+xyz     ruby-src/test1.ru       /^      alias_method :xyz,$/
 y       cp-src/conway.hpp       7
 y       cp-src/clheir.hpp       49
 y       cp-src/clheir.hpp       58
diff --git a/test/manual/etags/ETAGS.good_1 b/test/manual/etags/ETAGS.good_1
index c7b122111c4..1390187863f 100644
--- a/test/manual/etags/ETAGS.good_1
+++ b/test/manual/etags/ETAGS.good_1
@@ -2362,49 +2362,101 @@ function Square.something:Bar Bar14,148
   local function test.me22b 25,297
   local function test.me22b me22b25,297
-make-src/Makefile,1133
+make-src/Makefile,2175
 LATEST=1,0
+RELEASELIST=2,10
+ADASRC=4,104
+ASRC=5,171
+CSRC=6,197
+CPSRC=10,423
+ELSRC=13,614
+ERLSRC=14,661
+FORTHSRC=15,702
+FSRC=16,726
+HTMLSRC=17,776
+JAVASRC=18,844
+LUASRC=19,907
+MAKESRC=20,926
+OBJCSRC=21,943
+OBJCPPSRC=22,999
+PASSRC=23,1035
+PERLSRC=24,1053
+PHPSRC=25,1108
+PSSRC=26,1156
+PROLSRC=27,1173
+PYTSRC=28,1210
+TEXSRC=29,1227
+YSRC=30,1282
+SRCS=31,1325
 NONSRCS=35,1577
+VHDLFLAGS=37,1624
+COBOLFLAGS=38,1827
+POSTSCRIPTFLAGS=39,1889
+TCLFLAGS=40,1943
+GETOPTOBJS=42,2002
+RXINCLUDE=43,2034
+REGEXOBJS=44,2056
+CHECKOBJS=46,2075
+CHECKFLAGS=47,2105
+OBJS=48,2145
 CPPFLAGS=49,2190
 LDFLAGS=50,2259
+WARNINGS=51,2282
+CFLAGS=52,2466
 FASTCFLAGS=55,2530
+FASTCFLAGSWARN=56,2591
 FILTER=58,2641
-        @-$($72,3063
+REGEX=59,2695
-        @-$($73,3112
+xx=60,2741
-        @-$($74,3176
+MAKE:MAKE62,2790
-        @-$($75,3222
+RUN=63,2825
-        @-$($76,3290
+RUN=64,2865
-        @-$($77,3382
+OPTIONS=65,2870
-        @$(81,3465
+ARGS=66,2922
-        @$(82,3513
+infiles 68,2940
-        @$(83,3576
+quiettest:quiettest70,3002
-        @$(84,3621
+test:test79,3409
-        @$(85,3688
+${CHECKOBJS}:${CHECKOBJS}88,3805
-        @$(86,3779
+checker:checker90,3849
-${CHECKOBJS}: CFLAGS=88,3805
+standalone:standalone96,4062
-        @env CHECKEROPTS=92,3921
+prof:prof101,4168
-        @$(98,4093
+fastetags:fastetags104,4198
-        @$(106,4249
+fastctags:fastctags108,4322
-        @$(110,4373
+staticetags:staticetags112,4446
-        @$(114,4499
+rsynctofly:rsynctofly116,4608
-        @for i in $(SRCS); do echo $$i;140,5320
+rsyncfromfly:rsyncfromfly119,4698
-        $(160,6058
+web ftp publish:web ftp publish122,4794
-        $(163,6119
+release distrib:release distrib129,5115
-        $(166,6182
+tags:tags134,5255
-        $(169,6233
+clean:clean136,5267
-        $(172,6322
+srclist:srclist139,5302
-        sdiff --suppress-common-lines --width=width186,6619
+regexfile:regexfile143,5391
-        sdiff --suppress-common-lines --width=width189,6708
+/home/www/pub/etags.c.gz:/home/www/pub/etags.c.gz149,5566
-        sdiff --suppress-common-lines --width=width192,6796
+/home/www/pub/software/unix/etags.tar.gz:/home/www/pub/software/unix/etags.tar.gz156,5825
-        sdiff --suppress-common-lines --width=width195,6885
+regex.o:regex.o159,6031
-        TEXTAGS=204,7127
+getopt.o:getopt.o162,6086
-        TEXTAGS=def:newcommand:newenvironment ${RUN} etags$* --regex=regex204,7127
+getopt1.o:getopt1.o165,6147
-        ${RUN} etags12 --members -o $@ --regex=regex207,7244
+etags:etags168,6210
-        ${RUN} ./ctags -o $@ --regex=regex213,7393
+ctags:ctags171,6299
-        ${RUN} ctags$* -wtTd --globals --members -o $@ --regex=regex216,7469
+man manpage:man manpage174,6396
-        TEXTAGS=219,7588
+etags.1.man:etags.1.man176,6422
-        TEXTAGS=def:newcommand:newenvironment ${RUN} ctags$* -wt -o $@ --regex=regex219,7588
+maintaining.info:maintaining.info179,6475
-        ${RUN} ./extags -e --regex-c=c222,7715
+TAGS:TAGS182,6557
+%ediff:%ediff185,6587
+oediff:oediff188,6677
+%cdiff:%cdiff191,6764
+xdiff:xdiff194,6854
+ETAGS:ETAGS197,6942
+ETAGS%:ETAGS%200,7012
+ETAGS13 ETAGS14 ETAGS15:ETAGS13 ETAGS14 ETAGS15203,7084
+ETAGS12:ETAGS12206,7216
+OTAGS:OTAGS209,7304
+CTAGS:CTAGS212,7369
+CTAGS%:CTAGS%215,7443
+CTAGS13 CTAGS14 CTAGS15:CTAGS13 CTAGS14 CTAGS15218,7545
+EXTAGS:EXTAGS221,7680
+.PRECIOUS:.PRECIOUS224,7838
+FRC:FRC226,7894
 objc-src/Subprocess.h,98
 #define Subprocess 41,1217
@@ -3009,17 +3061,33 @@ module ModuleExample1,0
    def module_instance_method46,1051
    def ModuleExample.module_class_methodmodule_class_method49,1131
-ruby-src/test1.ruby,191
+ruby-src/test1.ru,828
 class A1,0
 def a(2,8
 def b(5,38
 module A9,57
  class B10,66
    ABC 11,76
-    def foo!13,89
+    Def_ 12,88
-    def self._bar?(_bar?16,111
+    Xyzzy 13,106
-      def qux=(qux=20,162
+    def foo!15,121
-A::Constant Constant26,211
+    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
 tex-src/testenv.tex,52
 \newcommand{\nm}\nm4,77
diff --git a/test/manual/etags/ETAGS.good_2 b/test/manual/etags/ETAGS.good_2
index 8d0f33824a4..f8b1546ef48 100644
--- a/test/manual/etags/ETAGS.good_2
+++ b/test/manual/etags/ETAGS.good_2
@@ -2931,50 +2931,101 @@ function Square.something:Bar Bar14,148
   local function test.me22b 25,297
   local function test.me22b me22b25,297
-make-src/Makefile,1156
+make-src/Makefile,2175
 LATEST=1,0
+RELEASELIST=2,10
+ADASRC=4,104
+ASRC=5,171
+CSRC=6,197
+CPSRC=10,423
+ELSRC=13,614
+ERLSRC=14,661
+FORTHSRC=15,702
+FSRC=16,726
+HTMLSRC=17,776
+JAVASRC=18,844
+LUASRC=19,907
+MAKESRC=20,926
+OBJCSRC=21,943
+OBJCPPSRC=22,999
+PASSRC=23,1035
+PERLSRC=24,1053
+PHPSRC=25,1108
+PSSRC=26,1156
+PROLSRC=27,1173
+PYTSRC=28,1210
+TEXSRC=29,1227
+YSRC=30,1282
+SRCS=31,1325
 NONSRCS=35,1577
+VHDLFLAGS=37,1624
+COBOLFLAGS=38,1827
+POSTSCRIPTFLAGS=39,1889
+TCLFLAGS=40,1943
+GETOPTOBJS=42,2002
+RXINCLUDE=43,2034
+REGEXOBJS=44,2056
+CHECKOBJS=46,2075
+CHECKFLAGS=47,2105
+OBJS=48,2145
 CPPFLAGS=49,2190
 LDFLAGS=50,2259
+WARNINGS=51,2282
+CFLAGS=52,2466
 FASTCFLAGS=55,2530
+FASTCFLAGSWARN=56,2591
 FILTER=58,2641
-        @-$($72,3063
+REGEX=59,2695
-        @-$($73,3112
+xx=60,2741
-        @-$($74,3176
+MAKE:MAKE62,2790
-        @-$($75,3222
+RUN=63,2825
-        @-$($76,3290
+RUN=64,2865
-        @-$($77,3382
+OPTIONS=65,2870
-        @$(81,3465
+ARGS=66,2922
-        @$(82,3513
+infiles 68,2940
-        @$(83,3576
+quiettest:quiettest70,3002
-        @$(84,3621
+test:test79,3409
-        @$(85,3688
+${CHECKOBJS}:${CHECKOBJS}88,3805
-        @$(86,3779
+checker:checker90,3849
-${CHECKOBJS}: CFLAGS=88,3805
+standalone:standalone96,4062
-        @env CHECKEROPTS=92,3921
+prof:prof101,4168
-        @$(98,4093
+fastetags:fastetags104,4198
-        @$(106,4249
+fastctags:fastctags108,4322
-        @$(110,4373
+staticetags:staticetags112,4446
-        @$(114,4499
+rsynctofly:rsynctofly116,4608
-        @for i in $(140,5320
+rsyncfromfly:rsyncfromfly119,4698
-        @for i in $(SRCS); do echo $$i;140,5320
+web ftp publish:web ftp publish122,4794
-        $(160,6058
+release distrib:release distrib129,5115
-        $(163,6119
+tags:tags134,5255
-        $(166,6182
+clean:clean136,5267
-        $(169,6233
+srclist:srclist139,5302
-        $(172,6322
+regexfile:regexfile143,5391
-        sdiff --suppress-common-lines --width=width186,6619
+/home/www/pub/etags.c.gz:/home/www/pub/etags.c.gz149,5566
-        sdiff --suppress-common-lines --width=width189,6708
+/home/www/pub/software/unix/etags.tar.gz:/home/www/pub/software/unix/etags.tar.gz156,5825
-        sdiff --suppress-common-lines --width=width192,6796
+regex.o:regex.o159,6031
-        sdiff --suppress-common-lines --width=width195,6885
+getopt.o:getopt.o162,6086
-        TEXTAGS=204,7127
+getopt1.o:getopt1.o165,6147
-        TEXTAGS=def:newcommand:newenvironment ${RUN} etags$* --regex=regex204,7127
+etags:etags168,6210
-        ${RUN} etags12 --members -o $@ --regex=regex207,7244
+ctags:ctags171,6299
-        ${RUN} ./ctags -o $@ --regex=regex213,7393
+man manpage:man manpage174,6396
-        ${RUN} ctags$* -wtTd --globals --members -o $@ --regex=regex216,7469
+etags.1.man:etags.1.man176,6422
-        TEXTAGS=219,7588
+maintaining.info:maintaining.info179,6475
-        TEXTAGS=def:newcommand:newenvironment ${RUN} ctags$* -wt -o $@ --regex=regex219,7588
+TAGS:TAGS182,6557
-        ${RUN} ./extags -e --regex-c=c222,7715
+%ediff:%ediff185,6587
+oediff:oediff188,6677
+%cdiff:%cdiff191,6764
+xdiff:xdiff194,6854
+ETAGS:ETAGS197,6942
+ETAGS%:ETAGS%200,7012
+ETAGS13 ETAGS14 ETAGS15:ETAGS13 ETAGS14 ETAGS15203,7084
+ETAGS12:ETAGS12206,7216
+OTAGS:OTAGS209,7304
+CTAGS:CTAGS212,7369
+CTAGS%:CTAGS%215,7443
+CTAGS13 CTAGS14 CTAGS15:CTAGS13 CTAGS14 CTAGS15218,7545
+EXTAGS:EXTAGS221,7680
+.PRECIOUS:.PRECIOUS224,7838
+FRC:FRC226,7894
 objc-src/Subprocess.h,98
 #define Subprocess 41,1217
@@ -3580,17 +3631,33 @@ module ModuleExample1,0
    def module_instance_method46,1051
    def ModuleExample.module_class_methodmodule_class_method49,1131
-ruby-src/test1.ruby,191
+ruby-src/test1.ru,828
 class A1,0
 def a(2,8
 def b(5,38
 module A9,57
  class B10,66
    ABC 11,76
-    def foo!13,89
+    Def_ 12,88
-    def self._bar?(_bar?16,111
+    Xyzzy 13,106
-      def qux=(qux=20,162
+    def foo!15,121
-A::Constant Constant26,211
+    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
 tex-src/testenv.tex,52
 \newcommand{\nm}\nm4,77
diff --git a/test/manual/etags/ETAGS.good_3 b/test/manual/etags/ETAGS.good_3
index 060389c6232..a1e895af7f6 100644
--- a/test/manual/etags/ETAGS.good_3
+++ b/test/manual/etags/ETAGS.good_3
@@ -2682,49 +2682,101 @@ function Square.something:Bar Bar14,148
   local function test.me22b 25,297
   local function test.me22b me22b25,297
-make-src/Makefile,1133
+make-src/Makefile,2175
 LATEST=1,0
+RELEASELIST=2,10
+ADASRC=4,104
+ASRC=5,171
+CSRC=6,197
+CPSRC=10,423
+ELSRC=13,614
+ERLSRC=14,661
+FORTHSRC=15,702
+FSRC=16,726
+HTMLSRC=17,776
+JAVASRC=18,844
+LUASRC=19,907
+MAKESRC=20,926
+OBJCSRC=21,943
+OBJCPPSRC=22,999
+PASSRC=23,1035
+PERLSRC=24,1053
+PHPSRC=25,1108
+PSSRC=26,1156
+PROLSRC=27,1173
+PYTSRC=28,1210
+TEXSRC=29,1227
+YSRC=30,1282
+SRCS=31,1325
 NONSRCS=35,1577
+VHDLFLAGS=37,1624
+COBOLFLAGS=38,1827
+POSTSCRIPTFLAGS=39,1889
+TCLFLAGS=40,1943
+GETOPTOBJS=42,2002
+RXINCLUDE=43,2034
+REGEXOBJS=44,2056
+CHECKOBJS=46,2075
+CHECKFLAGS=47,2105
+OBJS=48,2145
 CPPFLAGS=49,2190
 LDFLAGS=50,2259
+WARNINGS=51,2282
+CFLAGS=52,2466
 FASTCFLAGS=55,2530
+FASTCFLAGSWARN=56,2591
 FILTER=58,2641
-        @-$($72,3063
+REGEX=59,2695
-        @-$($73,3112
+xx=60,2741
-        @-$($74,3176
+MAKE:MAKE62,2790
-        @-$($75,3222
+RUN=63,2825
-        @-$($76,3290
+RUN=64,2865
-        @-$($77,3382
+OPTIONS=65,2870
-        @$(81,3465
+ARGS=66,2922
-        @$(82,3513
+infiles 68,2940
-        @$(83,3576
+quiettest:quiettest70,3002
-        @$(84,3621
+test:test79,3409
-        @$(85,3688
+${CHECKOBJS}:${CHECKOBJS}88,3805
-        @$(86,3779
+checker:checker90,3849
-${CHECKOBJS}: CFLAGS=88,3805
+standalone:standalone96,4062
-        @env CHECKEROPTS=92,3921
+prof:prof101,4168
-        @$(98,4093
+fastetags:fastetags104,4198
-        @$(106,4249
+fastctags:fastctags108,4322
-        @$(110,4373
+staticetags:staticetags112,4446
-        @$(114,4499
+rsynctofly:rsynctofly116,4608
-        @for i in $(SRCS); do echo $$i;140,5320
+rsyncfromfly:rsyncfromfly119,4698
-        $(160,6058
+web ftp publish:web ftp publish122,4794
-        $(163,6119
+release distrib:release distrib129,5115
-        $(166,6182
+tags:tags134,5255
-        $(169,6233
+clean:clean136,5267
-        $(172,6322
+srclist:srclist139,5302
-        sdiff --suppress-common-lines --width=width186,6619
+regexfile:regexfile143,5391
-        sdiff --suppress-common-lines --width=width189,6708
+/home/www/pub/etags.c.gz:/home/www/pub/etags.c.gz149,5566
-        sdiff --suppress-common-lines --width=width192,6796
+/home/www/pub/software/unix/etags.tar.gz:/home/www/pub/software/unix/etags.tar.gz156,5825
-        sdiff --suppress-common-lines --width=width195,6885
+regex.o:regex.o159,6031
-        TEXTAGS=204,7127
+getopt.o:getopt.o162,6086
-        TEXTAGS=def:newcommand:newenvironment ${RUN} etags$* --regex=regex204,7127
+getopt1.o:getopt1.o165,6147
-        ${RUN} etags12 --members -o $@ --regex=regex207,7244
+etags:etags168,6210
-        ${RUN} ./ctags -o $@ --regex=regex213,7393
+ctags:ctags171,6299
-        ${RUN} ctags$* -wtTd --globals --members -o $@ --regex=regex216,7469
+man manpage:man manpage174,6396
-        TEXTAGS=219,7588
+etags.1.man:etags.1.man176,6422
-        TEXTAGS=def:newcommand:newenvironment ${RUN} ctags$* -wt -o $@ --regex=regex219,7588
+maintaining.info:maintaining.info179,6475
-        ${RUN} ./extags -e --regex-c=c222,7715
+TAGS:TAGS182,6557
+%ediff:%ediff185,6587
+oediff:oediff188,6677
+%cdiff:%cdiff191,6764
+xdiff:xdiff194,6854
+ETAGS:ETAGS197,6942
+ETAGS%:ETAGS%200,7012
+ETAGS13 ETAGS14 ETAGS15:ETAGS13 ETAGS14 ETAGS15203,7084
+ETAGS12:ETAGS12206,7216
+OTAGS:OTAGS209,7304
+CTAGS:CTAGS212,7369
+CTAGS%:CTAGS%215,7443
+CTAGS13 CTAGS14 CTAGS15:CTAGS13 CTAGS14 CTAGS15218,7545
+EXTAGS:EXTAGS221,7680
+.PRECIOUS:.PRECIOUS224,7838
+FRC:FRC226,7894
 objc-src/Subprocess.h,98
 #define Subprocess 41,1217
@@ -3356,17 +3408,33 @@ module ModuleExample1,0
    def module_instance_method46,1051
    def ModuleExample.module_class_methodmodule_class_method49,1131
-ruby-src/test1.ruby,191
+ruby-src/test1.ru,828
 class A1,0
 def a(2,8
 def b(5,38
 module A9,57
  class B10,66
    ABC 11,76
-    def foo!13,89
+    Def_ 12,88
-    def self._bar?(_bar?16,111
+    Xyzzy 13,106
-      def qux=(qux=20,162
+    def foo!15,121
-A::Constant Constant26,211
+    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
 tex-src/testenv.tex,52
 \newcommand{\nm}\nm4,77
diff --git a/test/manual/etags/ETAGS.good_4 b/test/manual/etags/ETAGS.good_4
index 40404f9fc6e..32390fab324 100644
--- a/test/manual/etags/ETAGS.good_4
+++ b/test/manual/etags/ETAGS.good_4
@@ -2526,49 +2526,101 @@ function Square.something:Bar Bar14,148
   local function test.me22b 25,297
   local function test.me22b me22b25,297
-make-src/Makefile,1133
+make-src/Makefile,2175
 LATEST=1,0
+RELEASELIST=2,10
+ADASRC=4,104
+ASRC=5,171
+CSRC=6,197
+CPSRC=10,423
+ELSRC=13,614
+ERLSRC=14,661
+FORTHSRC=15,702
+FSRC=16,726
+HTMLSRC=17,776
+JAVASRC=18,844
+LUASRC=19,907
+MAKESRC=20,926
+OBJCSRC=21,943
+OBJCPPSRC=22,999
+PASSRC=23,1035
+PERLSRC=24,1053
+PHPSRC=25,1108
+PSSRC=26,1156
+PROLSRC=27,1173
+PYTSRC=28,1210
+TEXSRC=29,1227
+YSRC=30,1282
+SRCS=31,1325
 NONSRCS=35,1577
+VHDLFLAGS=37,1624
+COBOLFLAGS=38,1827
+POSTSCRIPTFLAGS=39,1889
+TCLFLAGS=40,1943
+GETOPTOBJS=42,2002
+RXINCLUDE=43,2034
+REGEXOBJS=44,2056
+CHECKOBJS=46,2075
+CHECKFLAGS=47,2105
+OBJS=48,2145
 CPPFLAGS=49,2190
 LDFLAGS=50,2259
+WARNINGS=51,2282
+CFLAGS=52,2466
 FASTCFLAGS=55,2530
+FASTCFLAGSWARN=56,2591
 FILTER=58,2641
-        @-$($72,3063
+REGEX=59,2695
-        @-$($73,3112
+xx=60,2741
-        @-$($74,3176
+MAKE:MAKE62,2790
-        @-$($75,3222
+RUN=63,2825
-        @-$($76,3290
+RUN=64,2865
-        @-$($77,3382
+OPTIONS=65,2870
-        @$(81,3465
+ARGS=66,2922
-        @$(82,3513
+infiles 68,2940
-        @$(83,3576
+quiettest:quiettest70,3002
-        @$(84,3621
+test:test79,3409
-        @$(85,3688
+${CHECKOBJS}:${CHECKOBJS}88,3805
-        @$(86,3779
+checker:checker90,3849
-${CHECKOBJS}: CFLAGS=88,3805
+standalone:standalone96,4062
-        @env CHECKEROPTS=92,3921
+prof:prof101,4168
-        @$(98,4093
+fastetags:fastetags104,4198
-        @$(106,4249
+fastctags:fastctags108,4322
-        @$(110,4373
+staticetags:staticetags112,4446
-        @$(114,4499
+rsynctofly:rsynctofly116,4608
-        @for i in $(SRCS); do echo $$i;140,5320
+rsyncfromfly:rsyncfromfly119,4698
-        $(160,6058
+web ftp publish:web ftp publish122,4794
-        $(163,6119
+release distrib:release distrib129,5115
-        $(166,6182
+tags:tags134,5255
-        $(169,6233
+clean:clean136,5267
-        $(172,6322
+srclist:srclist139,5302
-        sdiff --suppress-common-lines --width=width186,6619
+regexfile:regexfile143,5391
-        sdiff --suppress-common-lines --width=width189,6708
+/home/www/pub/etags.c.gz:/home/www/pub/etags.c.gz149,5566
-        sdiff --suppress-common-lines --width=width192,6796
+/home/www/pub/software/unix/etags.tar.gz:/home/www/pub/software/unix/etags.tar.gz156,5825
-        sdiff --suppress-common-lines --width=width195,6885
+regex.o:regex.o159,6031
-        TEXTAGS=204,7127
+getopt.o:getopt.o162,6086
-        TEXTAGS=def:newcommand:newenvironment ${RUN} etags$* --regex=regex204,7127
+getopt1.o:getopt1.o165,6147
-        ${RUN} etags12 --members -o $@ --regex=regex207,7244
+etags:etags168,6210
-        ${RUN} ./ctags -o $@ --regex=regex213,7393
+ctags:ctags171,6299
-        ${RUN} ctags$* -wtTd --globals --members -o $@ --regex=regex216,7469
+man manpage:man manpage174,6396
-        TEXTAGS=219,7588
+etags.1.man:etags.1.man176,6422
-        TEXTAGS=def:newcommand:newenvironment ${RUN} ctags$* -wt -o $@ --regex=regex219,7588
+maintaining.info:maintaining.info179,6475
-        ${RUN} ./extags -e --regex-c=c222,7715
+TAGS:TAGS182,6557
+%ediff:%ediff185,6587
+oediff:oediff188,6677
+%cdiff:%cdiff191,6764
+xdiff:xdiff194,6854
+ETAGS:ETAGS197,6942
+ETAGS%:ETAGS%200,7012
+ETAGS13 ETAGS14 ETAGS15:ETAGS13 ETAGS14 ETAGS15203,7084
+ETAGS12:ETAGS12206,7216
+OTAGS:OTAGS209,7304
+CTAGS:CTAGS212,7369
+CTAGS%:CTAGS%215,7443
+CTAGS13 CTAGS14 CTAGS15:CTAGS13 CTAGS14 CTAGS15218,7545
+EXTAGS:EXTAGS221,7680
+.PRECIOUS:.PRECIOUS224,7838
+FRC:FRC226,7894
 objc-src/Subprocess.h,98
 #define Subprocess 41,1217
@@ -3173,17 +3225,33 @@ module ModuleExample1,0
    def module_instance_method46,1051
    def ModuleExample.module_class_methodmodule_class_method49,1131
-ruby-src/test1.ruby,191
+ruby-src/test1.ru,828
 class A1,0
 def a(2,8
 def b(5,38
 module A9,57
  class B10,66
    ABC 11,76
-    def foo!13,89
+    Def_ 12,88
-    def self._bar?(_bar?16,111
+    Xyzzy 13,106
-      def qux=(qux=20,162
+    def foo!15,121
-A::Constant Constant26,211
+    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
 tex-src/testenv.tex,52
 \newcommand{\nm}\nm4,77
diff --git a/test/manual/etags/ETAGS.good_5 b/test/manual/etags/ETAGS.good_5
index 432819d3b32..ee19bcfc9d2 100644
--- a/test/manual/etags/ETAGS.good_5
+++ b/test/manual/etags/ETAGS.good_5
@@ -3415,50 +3415,101 @@ function Square.something:Bar Bar14,148
   local function test.me22b 25,297
   local function test.me22b me22b25,297
-make-src/Makefile,1156
+make-src/Makefile,2175
 LATEST=1,0
+RELEASELIST=2,10
+ADASRC=4,104
+ASRC=5,171
+CSRC=6,197
+CPSRC=10,423
+ELSRC=13,614
+ERLSRC=14,661
+FORTHSRC=15,702
+FSRC=16,726
+HTMLSRC=17,776
+JAVASRC=18,844
+LUASRC=19,907
+MAKESRC=20,926
+OBJCSRC=21,943
+OBJCPPSRC=22,999
+PASSRC=23,1035
+PERLSRC=24,1053
+PHPSRC=25,1108
+PSSRC=26,1156
+PROLSRC=27,1173
+PYTSRC=28,1210
+TEXSRC=29,1227
+YSRC=30,1282
+SRCS=31,1325
 NONSRCS=35,1577
+VHDLFLAGS=37,1624
+COBOLFLAGS=38,1827
+POSTSCRIPTFLAGS=39,1889
+TCLFLAGS=40,1943
+GETOPTOBJS=42,2002
+RXINCLUDE=43,2034
+REGEXOBJS=44,2056
+CHECKOBJS=46,2075
+CHECKFLAGS=47,2105
+OBJS=48,2145
 CPPFLAGS=49,2190
 LDFLAGS=50,2259
+WARNINGS=51,2282
+CFLAGS=52,2466
 FASTCFLAGS=55,2530
+FASTCFLAGSWARN=56,2591
 FILTER=58,2641
-        @-$($72,3063
+REGEX=59,2695
-        @-$($73,3112
+xx=60,2741
-        @-$($74,3176
+MAKE:MAKE62,2790
-        @-$($75,3222
+RUN=63,2825
-        @-$($76,3290
+RUN=64,2865
-        @-$($77,3382
+OPTIONS=65,2870
-        @$(81,3465
+ARGS=66,2922
-        @$(82,3513
+infiles 68,2940
-        @$(83,3576
+quiettest:quiettest70,3002
-        @$(84,3621
+test:test79,3409
-        @$(85,3688
+${CHECKOBJS}:${CHECKOBJS}88,3805
-        @$(86,3779
+checker:checker90,3849
-${CHECKOBJS}: CFLAGS=88,3805
+standalone:standalone96,4062
-        @env CHECKEROPTS=92,3921
+prof:prof101,4168
-        @$(98,4093
+fastetags:fastetags104,4198
-        @$(106,4249
+fastctags:fastctags108,4322
-        @$(110,4373
+staticetags:staticetags112,4446
-        @$(114,4499
+rsynctofly:rsynctofly116,4608
-        @for i in $(140,5320
+rsyncfromfly:rsyncfromfly119,4698
-        @for i in $(SRCS); do echo $$i;140,5320
+web ftp publish:web ftp publish122,4794
-        $(160,6058
+release distrib:release distrib129,5115
-        $(163,6119
+tags:tags134,5255
-        $(166,6182
+clean:clean136,5267
-        $(169,6233
+srclist:srclist139,5302
-        $(172,6322
+regexfile:regexfile143,5391
-        sdiff --suppress-common-lines --width=width186,6619
+/home/www/pub/etags.c.gz:/home/www/pub/etags.c.gz149,5566
-        sdiff --suppress-common-lines --width=width189,6708
+/home/www/pub/software/unix/etags.tar.gz:/home/www/pub/software/unix/etags.tar.gz156,5825
-        sdiff --suppress-common-lines --width=width192,6796
+regex.o:regex.o159,6031
-        sdiff --suppress-common-lines --width=width195,6885
+getopt.o:getopt.o162,6086
-        TEXTAGS=204,7127
+getopt1.o:getopt1.o165,6147
-        TEXTAGS=def:newcommand:newenvironment ${RUN} etags$* --regex=regex204,7127
+etags:etags168,6210
-        ${RUN} etags12 --members -o $@ --regex=regex207,7244
+ctags:ctags171,6299
-        ${RUN} ./ctags -o $@ --regex=regex213,7393
+man manpage:man manpage174,6396
-        ${RUN} ctags$* -wtTd --globals --members -o $@ --regex=regex216,7469
+etags.1.man:etags.1.man176,6422
-        TEXTAGS=219,7588
+maintaining.info:maintaining.info179,6475
-        TEXTAGS=def:newcommand:newenvironment ${RUN} ctags$* -wt -o $@ --regex=regex219,7588
+TAGS:TAGS182,6557
-        ${RUN} ./extags -e --regex-c=c222,7715
+%ediff:%ediff185,6587
+oediff:oediff188,6677
+%cdiff:%cdiff191,6764
+xdiff:xdiff194,6854
+ETAGS:ETAGS197,6942
+ETAGS%:ETAGS%200,7012
+ETAGS13 ETAGS14 ETAGS15:ETAGS13 ETAGS14 ETAGS15203,7084
+ETAGS12:ETAGS12206,7216
+OTAGS:OTAGS209,7304
+CTAGS:CTAGS212,7369
+CTAGS%:CTAGS%215,7443
+CTAGS13 CTAGS14 CTAGS15:CTAGS13 CTAGS14 CTAGS15218,7545
+EXTAGS:EXTAGS221,7680
+.PRECIOUS:.PRECIOUS224,7838
+FRC:FRC226,7894
 objc-src/Subprocess.h,98
 #define Subprocess 41,1217
@@ -4091,17 +4142,33 @@ module ModuleExample1,0
    def module_instance_method46,1051
    def ModuleExample.module_class_methodmodule_class_method49,1131
-ruby-src/test1.ruby,191
+ruby-src/test1.ru,828
 class A1,0
 def a(2,8
 def b(5,38
 module A9,57
  class B10,66
    ABC 11,76
-    def foo!13,89
+    Def_ 12,88
-    def self._bar?(_bar?16,111
+    Xyzzy 13,106
-      def qux=(qux=20,162
+    def foo!15,121
-A::Constant Constant26,211
+    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
 tex-src/testenv.tex,52
 \newcommand{\nm}\nm4,77
diff --git a/test/manual/etags/ETAGS.good_6 b/test/manual/etags/ETAGS.good_6
index 4ad5d76db27..f4d9ab8c1a1 100644
--- a/test/manual/etags/ETAGS.good_6
+++ b/test/manual/etags/ETAGS.good_6
@@ -3415,50 +3415,101 @@ function Square.something:Bar Bar14,148
   local function test.me22b 25,297
   local function test.me22b me22b25,297
-make-src/Makefile,1156
+make-src/Makefile,2175
 LATEST=1,0
+RELEASELIST=2,10
+ADASRC=4,104
+ASRC=5,171
+CSRC=6,197
+CPSRC=10,423
+ELSRC=13,614
+ERLSRC=14,661
+FORTHSRC=15,702
+FSRC=16,726
+HTMLSRC=17,776
+JAVASRC=18,844
+LUASRC=19,907
+MAKESRC=20,926
+OBJCSRC=21,943
+OBJCPPSRC=22,999
+PASSRC=23,1035
+PERLSRC=24,1053
+PHPSRC=25,1108
+PSSRC=26,1156
+PROLSRC=27,1173
+PYTSRC=28,1210
+TEXSRC=29,1227
+YSRC=30,1282
+SRCS=31,1325
 NONSRCS=35,1577
+VHDLFLAGS=37,1624
+COBOLFLAGS=38,1827
+POSTSCRIPTFLAGS=39,1889
+TCLFLAGS=40,1943
+GETOPTOBJS=42,2002
+RXINCLUDE=43,2034
+REGEXOBJS=44,2056
+CHECKOBJS=46,2075
+CHECKFLAGS=47,2105
+OBJS=48,2145
 CPPFLAGS=49,2190
 LDFLAGS=50,2259
+WARNINGS=51,2282
+CFLAGS=52,2466
 FASTCFLAGS=55,2530
+FASTCFLAGSWARN=56,2591
 FILTER=58,2641
-        @-$($72,3063
+REGEX=59,2695
-        @-$($73,3112
+xx=60,2741
-        @-$($74,3176
+MAKE:MAKE62,2790
-        @-$($75,3222
+RUN=63,2825
-        @-$($76,3290
+RUN=64,2865
-        @-$($77,3382
+OPTIONS=65,2870
-        @$(81,3465
+ARGS=66,2922
-        @$(82,3513
+infiles 68,2940
-        @$(83,3576
+quiettest:quiettest70,3002
-        @$(84,3621
+test:test79,3409
-        @$(85,3688
+${CHECKOBJS}:${CHECKOBJS}88,3805
-        @$(86,3779
+checker:checker90,3849
-${CHECKOBJS}: CFLAGS=88,3805
+standalone:standalone96,4062
-        @env CHECKEROPTS=92,3921
+prof:prof101,4168
-        @$(98,4093
+fastetags:fastetags104,4198
-        @$(106,4249
+fastctags:fastctags108,4322
-        @$(110,4373
+staticetags:staticetags112,4446
-        @$(114,4499
+rsynctofly:rsynctofly116,4608
-        @for i in $(140,5320
+rsyncfromfly:rsyncfromfly119,4698
-        @for i in $(SRCS); do echo $$i;140,5320
+web ftp publish:web ftp publish122,4794
-        $(160,6058
+release distrib:release distrib129,5115
-        $(163,6119
+tags:tags134,5255
-        $(166,6182
+clean:clean136,5267
-        $(169,6233
+srclist:srclist139,5302
-        $(172,6322
+regexfile:regexfile143,5391
-        sdiff --suppress-common-lines --width=width186,6619
+/home/www/pub/etags.c.gz:/home/www/pub/etags.c.gz149,5566
-        sdiff --suppress-common-lines --width=width189,6708
+/home/www/pub/software/unix/etags.tar.gz:/home/www/pub/software/unix/etags.tar.gz156,5825
-        sdiff --suppress-common-lines --width=width192,6796
+regex.o:regex.o159,6031
-        sdiff --suppress-common-lines --width=width195,6885
+getopt.o:getopt.o162,6086
-        TEXTAGS=204,7127
+getopt1.o:getopt1.o165,6147
-        TEXTAGS=def:newcommand:newenvironment ${RUN} etags$* --regex=regex204,7127
+etags:etags168,6210
-        ${RUN} etags12 --members -o $@ --regex=regex207,7244
+ctags:ctags171,6299
-        ${RUN} ./ctags -o $@ --regex=regex213,7393
+man manpage:man manpage174,6396
-        ${RUN} ctags$* -wtTd --globals --members -o $@ --regex=regex216,7469
+etags.1.man:etags.1.man176,6422
-        TEXTAGS=219,7588
+maintaining.info:maintaining.info179,6475
-        TEXTAGS=def:newcommand:newenvironment ${RUN} ctags$* -wt -o $@ --regex=regex219,7588
+TAGS:TAGS182,6557
-        ${RUN} ./extags -e --regex-c=c222,7715
+%ediff:%ediff185,6587
+oediff:oediff188,6677
+%cdiff:%cdiff191,6764
+xdiff:xdiff194,6854
+ETAGS:ETAGS197,6942
+ETAGS%:ETAGS%200,7012
+ETAGS13 ETAGS14 ETAGS15:ETAGS13 ETAGS14 ETAGS15203,7084
+ETAGS12:ETAGS12206,7216
+OTAGS:OTAGS209,7304
+CTAGS:CTAGS212,7369
+CTAGS%:CTAGS%215,7443
+CTAGS13 CTAGS14 CTAGS15:CTAGS13 CTAGS14 CTAGS15218,7545
+EXTAGS:EXTAGS221,7680
+.PRECIOUS:.PRECIOUS224,7838
+FRC:FRC226,7894
 objc-src/Subprocess.h,98
 #define Subprocess 41,1217
@@ -4091,17 +4142,33 @@ module ModuleExample1,0
    def module_instance_method46,1051
    def ModuleExample.module_class_methodmodule_class_method49,1131
-ruby-src/test1.ruby,191
+ruby-src/test1.ru,828
 class A1,0
 def a(2,8
 def b(5,38
 module A9,57
  class B10,66
    ABC 11,76
-    def foo!13,89
+    Def_ 12,88
-    def self._bar?(_bar?16,111
+    Xyzzy 13,106
-      def qux=(qux=20,162
+    def foo!15,121
-A::Constant Constant26,211
+    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
 tex-src/testenv.tex,52
 \newcommand{\nm}\nm4,77
diff --git a/test/manual/etags/Makefile b/test/manual/etags/Makefile
index a0cb90145e6..07ad0f46416 100644
--- a/test/manual/etags/Makefile
+++ b/test/manual/etags/Makefile
@@ -24,7 +24,7 @@ PHPSRC=$(addprefix ./php-src/,lce_functions.php ptest.php sendmail.php)
 PSSRC=$(addprefix ./ps-src/,rfc1245.ps)
 PROLSRC=$(addprefix ./prol-src/,ordsets.prolog natded.prolog)
 PYTSRC=$(addprefix ./pyt-src/,server.py)
-RBSRC=$(addprefix ./ruby-src/,test.rb test1.ruby)
+RBSRC=$(addprefix ./ruby-src/,test.rb test1.ru)
 TEXSRC=$(addprefix ./tex-src/,testenv.tex gzip.texi texinfo.tex nonewline.tex)
 YSRC=$(addprefix ./y-src/,parse.y parse.c atest.y cccp.c cccp.y)
 SRCS=${ADASRC} ${ASRC} ${CSRC} ${CPSRC} ${ELSRC} ${ERLSRC} ${FSRC}\
diff --git a/test/manual/indent/css-mode.css b/test/manual/indent/css-mode.css
index 24166b00282..3a00739bfc4 100644
--- a/test/manual/indent/css-mode.css
+++ b/test/manual/indent/css-mode.css
@@ -9,7 +9,7 @@ article[role="main"] {
 }
 a, b:hover, c {
-    color: black;
+    color: black !important;
 }
 a, b:hover {                    /* bug:20282 */
diff --git a/test/manual/indent/scss-mode.scss b/test/manual/indent/scss-mode.scss
index 02a4a98a8c5..e1ec90a5299 100644
--- a/test/manual/indent/scss-mode.scss
+++ b/test/manual/indent/scss-mode.scss
@@ -40,11 +40,20 @@ p.#{$name} var
 }
 article[role="main"] {
    $toto: 500 !global;
-    float: left;
+    $var-with-default: 300 !default;
+    float: left !important;
    width: 600px / 888px * 100%;
    height: 100px / 888px * 100%;
 }
+%placeholder {
+    color: #f0f0f0;
+}
+button {
+    @extend %placeholder !optional;
+}
 @import 'reset';
 @mixin border-radius($radius) {