Skip to content

Commit 3937381

Browse files
committed
patch 7.4.1019
Problem: Directory listing of "src" is too long. Solution: Rename the resources file to make it shorter.
1 parent af2dff8 commit 3937381

4 files changed

Lines changed: 7 additions & 5 deletions

File tree

Filelist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ SRC_UNIX = \
191191
src/gui_gtk_f.c \
192192
src/gui_gtk_f.h \
193193
src/gui_gtk_x11.c \
194-
src/gui_gtk_gresources.xml \
194+
src/gui_gtk_res.xml \
195195
src/gui_motif.c \
196196
src/gui_xmdlg.c \
197197
src/gui_xmebw.c \

src/Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2474,7 +2474,7 @@ SHADOWDIR = shadow
24742474

24752475
shadow: runtime pixmaps
24762476
mkdir $(SHADOWDIR)
2477-
cd $(SHADOWDIR); ln -s ../*.[ch] ../*.in ../*.sh ../*.xs ../*.xbm ../gui_gtk_gresources.xml ../toolcheck ../proto ../vimtutor ../gvimtutor ../mkinstalldirs .
2477+
cd $(SHADOWDIR); ln -s ../*.[ch] ../*.in ../*.sh ../*.xs ../*.xbm ../gui_gtk_res.xml ../toolcheck ../proto ../vimtutor ../gvimtutor ../mkinstalldirs .
24782478
mkdir $(SHADOWDIR)/auto
24792479
cd $(SHADOWDIR)/auto; ln -s ../../auto/configure .
24802480
mkdir $(SHADOWDIR)/po
@@ -2595,9 +2595,9 @@ auto/pathdef.c: Makefile auto/config.mk
25952595
-@echo '";' >> $@
25962596
-@sh $(srcdir)/pathdef.sh
25972597

2598-
auto/gui_gtk_gresources.c: gui_gtk_gresources.xml
2598+
auto/gui_gtk_gresources.c: gui_gtk_res.xml
25992599
$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=../pixmaps --generate --c-name=gui_gtk --manual-register $<
2600-
auto/gui_gtk_gresources.h: gui_gtk_gresources.xml
2600+
auto/gui_gtk_gresources.h: gui_gtk_res.xml
26012601
$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=../pixmaps --generate --c-name=gui_gtk --manual-register $<
26022602

26032603
# 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 \
31703170
auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \
31713171
regexp.h gui.h gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h \
31723172
globals.h farsi.h arabic.h gui_gtk_f.h
3173-
objects/gui_gtk_gresources.o: auto/gui_gtk_gresources.c gui_gtk_gresources.xml \
3173+
objects/gui_gtk_gresources.o: auto/gui_gtk_gresources.c gui_gtk_res.xml \
31743174
../pixmaps/stock_vim_build_tags.png ../pixmaps/stock_vim_find_help.png \
31753175
../pixmaps/stock_vim_save_all.png ../pixmaps/stock_vim_session_load.png \
31763176
../pixmaps/stock_vim_session_new.png ../pixmaps/stock_vim_session_save.png \

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -741,6 +741,8 @@ static char *(features[]) =
741741

742742
static int included_patches[] =
743743
{ /* Add new patch number below this line */
744+
/**/
745+
1019,
744746
/**/
745747
1018,
746748
/**/

0 commit comments

Comments
 (0)