Patch 7.4.2059
Problem: Non-Unix builds fail.
Solution: Update Makefiles for new files.
Files: src/Make_bc5.mak, src/Make_cyg_ming.mak, src/Make_dice.mak,
src/Make_ivc.mak, src/Make_manx.mak, src/Make_morph.mak,
src/Make_mvc.mak, src/Make_sas.mak
*** ../vim-7.4.2058/src/Make_bc5.mak 2016-07-16 14:46:51.123240668 +0200
--- src/Make_bc5.mak 2016-07-17 18:32:37.821432152 +0200
***************
*** 543,548 ****
--- 543,549 ----
$(OBJDIR)\charset.obj \
$(OBJDIR)\crypt.obj \
$(OBJDIR)\crypt_zip.obj \
+ $(OBJDIR)\dict.obj \
$(OBJDIR)\diff.obj \
$(OBJDIR)\digraph.obj \
$(OBJDIR)\edit.obj \
***************
*** 559,564 ****
--- 560,566 ----
$(OBJDIR)\hardcopy.obj \
$(OBJDIR)\hashtab.obj \
$(OBJDIR)\json.obj \
+ $(OBJDIR)\list.obj \
$(OBJDIR)\main.obj \
$(OBJDIR)\mark.obj \
$(OBJDIR)\memfile.obj \
***************
*** 584,589 ****
--- 586,592 ----
$(OBJDIR)\term.obj \
$(OBJDIR)\ui.obj \
$(OBJDIR)\undo.obj \
+ $(OBJDIR)\userfunc.obj \
$(OBJDIR)\version.obj \
$(OBJDIR)\window.obj \
$(OBJDIR)\pathdef.obj
*** ../vim-7.4.2058/src/Make_cyg_ming.mak 2016-07-14 20:24:59.351396346
+0200
--- src/Make_cyg_ming.mak 2016-07-17 18:33:11.277085844 +0200
***************
*** 610,615 ****
--- 610,616 ----
$(OUTDIR)/charset.o \
$(OUTDIR)/crypt.o \
$(OUTDIR)/crypt_zip.o \
+ $(OUTDIR)/dict.o \
$(OUTDIR)/diff.o \
$(OUTDIR)/digraph.o \
$(OUTDIR)/edit.o \
***************
*** 626,631 ****
--- 627,633 ----
$(OUTDIR)/hardcopy.o \
$(OUTDIR)/hashtab.o \
$(OUTDIR)/json.o \
+ $(OUTDIR)/list.o \
$(OUTDIR)/main.o \
$(OUTDIR)/mark.o \
$(OUTDIR)/memfile.o \
***************
*** 655,660 ****
--- 657,663 ----
$(OUTDIR)/term.o \
$(OUTDIR)/ui.o \
$(OUTDIR)/undo.o \
+ $(OUTDIR)/userfunc.o \
$(OUTDIR)/version.o \
$(OUTDIR)/vimrc.o \
$(OUTDIR)/window.o
*** ../vim-7.4.2058/src/Make_dice.mak 2016-07-02 20:27:29.957436300 +0200
--- src/Make_dice.mak 2016-07-17 18:34:47.580089104 +0200
***************
*** 32,37 ****
--- 32,38 ----
charset.c \
crypt.c \
crypt_zip.c \
+ dict.c \
diff.c \
digraph.c \
edit.c \
***************
*** 48,53 ****
--- 49,55 ----
hardcopy.c \
hashtab.c \
json.c \
+ list.c \
main.c \
mark.c \
memfile.c \
***************
*** 74,79 ****
--- 76,82 ----
term.c \
ui.c \
undo.c \
+ userfunc.c \
window.c \
version.c
***************
*** 83,88 ****
--- 86,92 ----
o/charset.o \
o/crypt.o \
o/crypt_zip.o \
+ o/dict.o \
o/diff.o \
o/digraph.o \
o/edit.o \
***************
*** 99,104 ****
--- 103,109 ----
o/hardcopy.o \
o/hashtab.o \
o/json.o \
+ o/list.o \
o/main.o \
o/mark.o \
o/memfile.o \
***************
*** 125,130 ****
--- 130,136 ----
o/term.o \
o/ui.o \
o/undo.o \
+ o/userfunc.o \
o/window.o \
$(TERMLIB)
***************
*** 159,164 ****
--- 165,172 ----
o/crypt_zip.o: crypt_zip.c $(SYMS)
+ o/dict.o: dict.c $(SYMS)
+
o/diff.o: diff.c $(SYMS)
o/digraph.o: digraph.c $(SYMS)
***************
*** 191,196 ****
--- 199,206 ----
o/json.o: json.c $(SYMS)
+ o/list.o: list.c $(SYMS)
+
o/main.o: main.c $(SYMS)
o/mark.o: mark.c $(SYMS)
***************
*** 246,253 ****
o/termlib.o: termlib.c $(SYMS)
! o/ui.o: ui.c $(SYMS)
! o/undo.o: undo.c $(SYMS)
! o/window.o: window.c $(SYMS)
--- 256,265 ----
o/termlib.o: termlib.c $(SYMS)
! o/ui.o: ui.c $(SYMS)
!
! o/undo.o: undo.c $(SYMS)
! o/userfunc.o: userfunc.c $(SYMS)
! o/window.o: window.c $(SYMS)
*** ../vim-7.4.2058/src/Make_ivc.mak 2016-07-02 20:27:29.957436300 +0200
--- src/Make_ivc.mak 2016-07-17 18:35:39.011556853 +0200
***************
*** 216,221 ****
--- 216,222 ----
"$(INTDIR)/charset.obj" \
"$(INTDIR)/crypt.obj" \
"$(INTDIR)/crypt_zip.obj" \
+ "$(INTDIR)/dict.obj" \
"$(INTDIR)/diff.obj" \
"$(INTDIR)/digraph.obj" \
"$(INTDIR)/edit.obj" \
***************
*** 232,237 ****
--- 233,239 ----
"$(INTDIR)/hardcopy.obj" \
"$(INTDIR)/hashtab.obj" \
"$(INTDIR)/json.obj" \
+ "$(INTDIR)/list.obj" \
"$(INTDIR)/main.obj" \
"$(INTDIR)/mark.obj" \
"$(INTDIR)/mbyte.obj" \
***************
*** 260,265 ****
--- 262,268 ----
"$(INTDIR)/term.obj" \
"$(INTDIR)/ui.obj" \
"$(INTDIR)/undo.obj" \
+ "$(INTDIR)/userfunc.obj" \
"$(INTDIR)/version.obj" \
"$(INTDIR)/window.obj"
***************
*** 356,361 ****
--- 359,368 ----
# End Source File
# Begin Source File
+ SOURCE=.\dict.c
+ # End Source File
+ # Begin Source File
+
SOURCE=.\diff.c
# End Source File
# Begin Source File
***************
*** 570,575 ****
--- 577,586 ----
# End Source File
# Begin Source File
+ SOURCE=.\list.c
+ # End Source File
+ # Begin Source File
+
SOURCE=.\main.c
# End Source File
# Begin Source File
***************
*** 682,687 ****
--- 693,702 ----
# End Source File
# Begin Source File
+ SOURCE=.\userfunc.c
+ # End Source File
+ # Begin Source File
+
SOURCE=.\version.c
# End Source File
# Begin Source File
*** ../vim-7.4.2058/src/Make_manx.mak 2016-07-02 20:27:29.957436300 +0200
--- src/Make_manx.mak 2016-07-17 18:37:04.726669918 +0200
***************
*** 42,47 ****
--- 42,48 ----
charset.c \
crypt.c \
crypt_zip.c \
+ dict.c \
diff.c \
digraph.c \
edit.c \
***************
*** 58,63 ****
--- 59,65 ----
hardcopy.c \
hashtab.c \
json.c \
+ list.c \
main.c \
mark.c \
memfile.c \
***************
*** 84,89 ****
--- 86,92 ----
term.c \
ui.c \
undo.c \
+ userfunc.c \
window.c \
version.c
***************
*** 95,100 ****
--- 98,104 ----
obj/charset.o \
obj/crypt.o \
obj/crypt_zip.o \
+ obj/dict.o \
obj/diff.o \
obj/digraph.o \
obj/edit.o \
***************
*** 111,116 ****
--- 115,121 ----
obj/hardcopy.o \
obj/hashtab.o \
obj/json.o \
+ obj/list.o \
obj/main.o \
obj/mark.o \
obj/memfile.o \
***************
*** 137,142 ****
--- 142,148 ----
obj/term.o \
obj/ui.o \
obj/undo.o \
+ obj/userfunc.o \
obj/window.o \
$(TERMLIB)
***************
*** 146,151 ****
--- 152,158 ----
proto/charset.pro \
proto/crypt.pro \
proto/crypt_zip.pro \
+ proto/dict.pro \
proto/diff.pro \
proto/digraph.pro \
proto/edit.pro \
***************
*** 162,167 ****
--- 169,175 ----
proto/hardcopy.pro \
proto/hashtab.pro \
proto/json.pro \
+ proto/list.pro \
proto/main.pro \
proto/mark.pro \
proto/memfile.pro \
***************
*** 189,194 ****
--- 197,203 ----
proto/termlib.pro \
proto/ui.pro \
proto/undo.pro \
+ proto/userfunc.pro \
proto/window.pro
all: Vim xxd/Xxd
***************
*** 253,258 ****
--- 262,270 ----
obj/crypt_zip.o: crypt_zip.c
$(CCSYM) $@ crypt_zip.c
+ obj/dict.o: dict.c
+ $(CCSYM) $@ dict.c
+
obj/diff.o: diff.c
$(CCSYM) $@ diff.c
***************
*** 302,307 ****
--- 314,322 ----
obj/json.o: json.c
$(CCSYM) $@ json.c
+ obj/list.o: list.c
+ $(CCSYM) $@ list.c
+
# Don't use $(SYMS) here, because main.c defines EXTERN
obj/main.o: main.c option.h globals.h
$(CCNOSYM) $@ main.c
***************
*** 386,390 ****
--- 401,408 ----
obj/undo.o: undo.c
$(CCSYM) $@ undo.c
+ obj/userfunc.o: userfunc.c
+ $(CCSYM) $@ userfunc.c
+
obj/window.o: window.c
$(CCSYM) $@ window.c
*** ../vim-7.4.2058/src/Make_morph.mak 2016-07-02 20:27:29.957436300 +0200
--- src/Make_morph.mak 2016-07-17 18:37:35.642350051 +0200
***************
*** 30,35 ****
--- 30,36 ----
charset.c \
crypt.c \
crypt_zip.c \
+ dict.c \
diff.c \
digraph.c \
edit.c \
***************
*** 46,51 ****
--- 47,53 ----
hardcopy.c \
hashtab.c \
json.c \
+ list.c \
main.c \
mark.c \
mbyte.c \
***************
*** 72,77 ****
--- 74,80 ----
term.c \
ui.c \
undo.c \
+ userfunc.c \
version.c \
window.c \
*** ../vim-7.4.2058/src/Make_mvc.mak 2016-07-02 20:27:29.957436300 +0200
--- src/Make_mvc.mak 2016-07-17 18:38:44.925633274 +0200
***************
*** 554,559 ****
--- 554,560 ----
$(OUTDIR)\charset.obj \
$(OUTDIR)\crypt.obj \
$(OUTDIR)\crypt_zip.obj \
+ $(OUTDIR)\dict.obj \
$(OUTDIR)\diff.obj \
$(OUTDIR)\digraph.obj \
$(OUTDIR)\edit.obj \
***************
*** 570,575 ****
--- 571,577 ----
$(OUTDIR)\hardcopy.obj \
$(OUTDIR)\hashtab.obj \
$(OUTDIR)\json.obj \
+ $(OUTDIR)\list.obj \
$(OUTDIR)\main.obj \
$(OUTDIR)\mark.obj \
$(OUTDIR)\mbyte.obj \
***************
*** 599,604 ****
--- 601,607 ----
$(OUTDIR)\term.obj \
$(OUTDIR)\ui.obj \
$(OUTDIR)\undo.obj \
+ $(OUTDIR)\userfunc.obj \
$(OUTDIR)\window.obj \
$(OUTDIR)\vim.res
***************
*** 1162,1167 ****
--- 1165,1172 ----
$(OUTDIR)/crypt_zip.obj: $(OUTDIR) crypt_zip.c $(INCL)
+ $(OUTDIR)/dict.obj: $(OUTDIR) dictf.c $(INCL)
+
$(OUTDIR)/diff.obj: $(OUTDIR) diff.c $(INCL)
$(OUTDIR)/digraph.obj: $(OUTDIR) digraph.c $(INCL)
***************
*** 1241,1246 ****
--- 1246,1253 ----
$(OUTDIR)/json.obj: $(OUTDIR) json.c $(INCL)
+ $(OUTDIR)/list.obj: $(OUTDIR) list.c $(INCL)
+
$(OUTDIR)/main.obj: $(OUTDIR) main.c $(INCL) $(CUI_INCL)
$(OUTDIR)/mark.obj: $(OUTDIR) mark.c $(INCL)
***************
*** 1306,1311 ****
--- 1313,1320 ----
$(OUTDIR)/undo.obj: $(OUTDIR) undo.c $(INCL)
+ $(OUTDIR)/userfunc.obj: $(OUTDIR) userfunc.c $(INCL)
+
$(OUTDIR)/window.obj: $(OUTDIR) window.c $(INCL)
$(OUTDIR)/xpm_w32.obj: $(OUTDIR) xpm_w32.c
***************
*** 1358,1363 ****
--- 1367,1373 ----
proto/charset.pro \
proto/crypt.pro \
proto/crypt_zip.pro \
+ proto/dict.pro \
proto/diff.pro \
proto/digraph.pro \
proto/edit.pro \
***************
*** 1373,1378 ****
--- 1383,1389 ----
proto/hardcopy.pro \
proto/hashtab.pro \
proto/json.pro \
+ proto/list.pro \
proto/main.pro \
proto/mark.pro \
proto/memfile.pro \
***************
*** 1401,1406 ****
--- 1412,1418 ----
proto/term.pro \
proto/ui.pro \
proto/undo.pro \
+ proto/userfunc.pro \
proto/window.pro \
$(NETBEANS_PRO) \
$(CHANNEL_PRO)
*** ../vim-7.4.2058/src/Make_sas.mak 2016-07-02 20:27:29.957436300 +0200
--- src/Make_sas.mak 2016-07-17 18:40:12.808724190 +0200
***************
*** 95,100 ****
--- 95,101 ----
charset.c \
crypt.c \
crypt_zip.c \
+ dict.c \
diff.c \
digraph.c \
edit.c \
***************
*** 111,116 ****
--- 112,118 ----
hardcopy.c \
hashtab.c \
json.c \
+ list.c \
main.c \
mark.c \
memfile.c \
***************
*** 137,142 ****
--- 139,145 ----
term.c \
ui.c \
undo.c \
+ userfunc.c \
window.c \
version.c
***************
*** 147,152 ****
--- 150,156 ----
charset.o \
crypt.o \
crypt_zip.o \
+ dict.o \
diff.o \
digraph.o \
edit.o \
***************
*** 163,168 ****
--- 167,173 ----
hardcopy.o \
hashtab.o \
json.o \
+ list.o \
main.o \
mark.o \
memfile.o \
***************
*** 189,194 ****
--- 194,200 ----
term.o \
ui.o \
undo.o \
+ userfunc.o \
window.o \
$(TERMLIB)
***************
*** 199,204 ****
--- 205,211 ----
proto/charset.pro \
proto/crypt.pro \
proto/crypt_zip.pro \
+ proto/dict.pro \
proto/diff.pro \
proto/digraph.pro \
proto/edit.pro \
***************
*** 215,220 ****
--- 222,228 ----
proto/hardcopy.pro \
proto/hashtab.pro \
proto/json.pro \
+ proto/list.pro \
proto/main.pro \
proto/mark.pro \
proto/memfile.pro \
***************
*** 242,247 ****
--- 250,256 ----
proto/termlib.pro \
proto/ui.pro \
proto/undo.pro \
+ proto/userfunc.pro \
proto/window.pro
all: proto Vim
***************
*** 311,316 ****
--- 320,327 ----
proto/crypt.pro: crypt.c
crypt_zip.o: crypt_zip.c
proto/crypt_zip.pro: crypt_zip.c
+ dict.o: dict.c
+ proto/dict.pro: dict.c
diff.o: diff.c
proto/diff.pro: diff.c
digraph.o: digraph.c
***************
*** 343,348 ****
--- 354,361 ----
proto/hashtab.pro: hashtab.c
json.o: json.c
proto/json.pro: json.c
+ list.o: list.c
+ proto/list.pro: list.c
main.o: main.c
proto/main.pro: main.c
mark.o: mark.c
***************
*** 397,400 ****
--- 410,415 ----
proto/ui.pro: ui.c
undo.o: undo.c
proto/undo.pro: undo.c
+ userfunc.o: userfunc.c
+ proto/userfunc.pro: userfunc.c
window.o: window.c
*** ../vim-7.4.2058/src/version.c 2016-07-17 18:28:59.027697464 +0200
--- src/version.c 2016-07-17 18:40:19.072659398 +0200
***************
*** 760,761 ****
--- 760,763 ----
{ /* Add new patch number below this line */
+ /**/
+ 2059,
/**/
--
[clop clop]
GUARD #1: Halt! Who goes there?
ARTHUR: It is I, Arthur, son of Uther Pendragon, from the castle of
Camelot. King of the Britons, defeator of the Saxons, sovereign of
all England!
GUARD #1: Pull the other one!
The Quest for the Holy Grail (Monty Python)
/// Bram Moolenaar -- [email protected] -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
