# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1451665804 -3600
# Node ID e2fe7a67b3a4a6a11c1b97fb836332d65c45fe44
# Parent  7adae107ac2f50a74f4e9ec461248f533d5cb710
commit https://github.com/vim/vim/commit/39373819fd5fad825df416f1e2b96a6f43758e23
Author: Bram Moolenaar <Bram@vim.org>
Date:   Fri Jan 1 17:20:27 2016 +0100

    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
--- 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
--- 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 a
  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_gresources.xml
deleted file mode 100644
--- a/src/gui_gtk_gresources.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<gresources>
-    <gresource prefix="/org/vim/gui/icon">
-        <file>stock_vim_build_tags.png</file>
-        <file>stock_vim_find_help.png</file>
-        <file>stock_vim_save_all.png</file>
-        <file>stock_vim_session_load.png</file>
-        <file>stock_vim_session_new.png</file>
-        <file>stock_vim_session_save.png</file>
-        <file>stock_vim_shell.png</file>
-        <file>stock_vim_window_maximize.png</file>
-        <file>stock_vim_window_maximize_width.png</file>
-        <file>stock_vim_window_minimize.png</file>
-        <file>stock_vim_window_minimize_width.png</file>
-        <file>stock_vim_window_split.png</file>
-        <file>stock_vim_window_split_vertical.png</file>
-    </gresource>
-</gresources>
diff --git a/src/gui_gtk_res.xml b/src/gui_gtk_res.xml
new file mode 100644
--- /dev/null
+++ b/src/gui_gtk_res.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+    <gresource prefix="/org/vim/gui/icon">
+        <file>stock_vim_build_tags.png</file>
+        <file>stock_vim_find_help.png</file>
+        <file>stock_vim_save_all.png</file>
+        <file>stock_vim_session_load.png</file>
+        <file>stock_vim_session_new.png</file>
+        <file>stock_vim_session_save.png</file>
+        <file>stock_vim_shell.png</file>
+        <file>stock_vim_window_maximize.png</file>
+        <file>stock_vim_window_maximize_width.png</file>
+        <file>stock_vim_window_minimize.png</file>
+        <file>stock_vim_window_minimize_width.png</file>
+        <file>stock_vim_window_split.png</file>
+        <file>stock_vim_window_split_vertical.png</file>
+    </gresource>
+</gresources>
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1019,
+/**/
     1018,
 /**/
     1017,