patch 7.4.1019

Problem:    Directory listing of "src" is too long.
Solution:   Rename the resources file to make it shorter.

diff --git a/Filelist b/Filelist
index 80049256d07a8feffe89f409c5ec64ea9bb49842..fcb1ed13c3f4fde5559b5cb87935d217650cd268 100644 (file)
--- a/Filelist
+++ b/Filelist
@@ -191,7 +191,7 @@ SRC_UNIX =  \
                src/gui_gtk_f.c \
                src/gui_gtk_f.h \
                src/gui_gtk_x11.c \
-               src/gui_gtk_gresources.xml \
+               src/gui_gtk_res.xml \
                src/gui_motif.c \
                src/gui_xmdlg.c \
                src/gui_xmebw.c \

diff --git a/src/Makefile b/src/Makefile
index f0bfbb5787a4d1cc4ab1129db827faeda2b00185..500287f8474b8eb1b4ba08efae7bb5be84f0d39f 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -2474,7 +2474,7 @@ SHADOWDIR = shadow
 
 shadow:        runtime pixmaps
        mkdir $(SHADOWDIR)
-       cd $(SHADOWDIR); ln -s ../*.[ch] ../*.in ../*.sh ../*.xs ../*.xbm ../gui_gtk_gresources.xml ../toolcheck ../proto ../vimtutor ../gvimtutor ../mkinstalldirs .
+       cd $(SHADOWDIR); ln -s ../*.[ch] ../*.in ../*.sh ../*.xs ../*.xbm ../gui_gtk_res.xml ../toolcheck ../proto ../vimtutor ../gvimtutor ../mkinstalldirs .
        mkdir $(SHADOWDIR)/auto
        cd $(SHADOWDIR)/auto; ln -s ../../auto/configure .
        mkdir $(SHADOWDIR)/po
@@ -2595,9 +2595,9 @@ auto/pathdef.c: Makefile auto/config.mk
        -@echo '";' >> $@
        -@sh $(srcdir)/pathdef.sh
 
-auto/gui_gtk_gresources.c: gui_gtk_gresources.xml
+auto/gui_gtk_gresources.c: gui_gtk_res.xml
        $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=../pixmaps --generate --c-name=gui_gtk --manual-register $<
-auto/gui_gtk_gresources.h: gui_gtk_gresources.xml
+auto/gui_gtk_gresources.h: gui_gtk_res.xml
        $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=../pixmaps --generate --c-name=gui_gtk --manual-register $<
 
 # All the object files are put in the "objects" directory.  Since not all make
@@ -3170,7 +3170,7 @@ objects/gui_gtk_f.o: gui_gtk_f.c vim.h auto/config.h feature.h os_unix.h \
  auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \
  regexp.h gui.h gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h \
  globals.h farsi.h arabic.h gui_gtk_f.h
-objects/gui_gtk_gresources.o: auto/gui_gtk_gresources.c gui_gtk_gresources.xml \
+objects/gui_gtk_gresources.o: auto/gui_gtk_gresources.c gui_gtk_res.xml \
  ../pixmaps/stock_vim_build_tags.png ../pixmaps/stock_vim_find_help.png \
  ../pixmaps/stock_vim_save_all.png ../pixmaps/stock_vim_session_load.png \
  ../pixmaps/stock_vim_session_new.png ../pixmaps/stock_vim_session_save.png \

diff --git a/src/gui_gtk_gresources.xml b/src/gui_gtk_res.xml
similarity index 100%
rename from src/gui_gtk_gresources.xml
rename to src/gui_gtk_res.xml

diff --git a/src/version.c b/src/version.c
index 98066f8ff9fe15cdf85f46f427d472cbd2f33835..70c54aa47d811b6403ef78ed29fada21d3b88625 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1019,
 /**/
     1018,
 /**/