patch 8.0.1032: "make tags" doesn't work well on MS-Windows

Problem:    "make tags" doesn't work well on MS-Windows.
Solution:   Add or fix tags target. (Ken Takata)

diff --git a/src/Make_cyg_ming.mak b/src/Make_cyg_ming.mak
index 52db5613801125f4a16382ee703f88f2aafade3e..de2c5df5249b4f764ac0268ba435ca8b4f754525 100644 (file)
--- a/src/Make_cyg_ming.mak
+++ b/src/Make_cyg_ming.mak
@@ -76,6 +76,10 @@ endif
 # Set to yes to enable terminal support.
 TERMINAL=no
 
+ifndef CTAGS
+# this assumes ctags is Exuberant ctags
+CTAGS = ctags -I INIT+ --fields=+S
+endif
 
 # Link against the shared version of libstdc++ by default.  Set
 # STATIC_STDCPLUS to "yes" to link against static version instead.
@@ -885,6 +889,12 @@ xxd/xxd.exe: xxd/xxd.c
 GvimExt/gvimext.dll: GvimExt/gvimext.cpp GvimExt/gvimext.rc GvimExt/gvimext.h
        $(MAKE) -C GvimExt -f Make_ming.mak CROSS=$(CROSS) CROSS_COMPILE=$(CROSS_COMPILE) CXX='$(CXX)' STATIC_STDCPLUS=$(STATIC_STDCPLUS)
 
+tags: notags
+       $(CTAGS) *.c *.cpp *.h if_perl.xs
+
+notags:
+       -$(DEL) tags
+
 clean:
        -$(DEL) $(OUTDIR)$(DIRSLASH)*.o
        -$(DEL) $(OUTDIR)$(DIRSLASH)*.res

diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak
index c8c1d11736c8d399cb6b23e6c4777c3cd5e35417..33d6dcbf2f4efa1230a82d0ea3f26643e0b1f6a6 100644 (file)
--- a/src/Make_mvc.mak
+++ b/src/Make_mvc.mak
@@ -344,7 +344,8 @@ FEATURES = HUGE
 !endif
 
 !ifndef CTAGS
-CTAGS = ctags
+# this assumes ctags is Exuberant ctags
+CTAGS = ctags -I INIT+ --fields=+S
 !endif
 
 !ifndef CSCOPE
@@ -1220,7 +1221,7 @@ GvimExt/gvimext.dll: GvimExt/gvimext.cpp GvimExt/gvimext.rc GvimExt/gvimext.h
 
 
 tags: notags
-       $(CTAGS) *.c *.cpp *.h if_perl.xs proto\*.pro
+       $(CTAGS) *.c *.cpp *.h if_perl.xs
 
 notags:
        - if exist tags del tags

diff --git a/src/version.c b/src/version.c
index 4eff429707aeb0626af37f2baac86d13f5e910b9..beb8ee720389ea8573ddf947170c7e7ca3734cc6 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -769,6 +769,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1032,
 /**/
     1031,
 /**/