Skip to content

Commit 800be67

Browse files
splhacksplhack
committed
Merge remote-tracking branch 'vim/master'
2 parents 463f72a + c1fb763 commit 800be67

28 files changed

Lines changed: 19426 additions & 18956 deletions

‎Filelist‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ SRC_ALL = \
2323
src/digraph.c \
2424
src/edit.c \
2525
src/eval.c \
26+
src/evalfunc.c \
2627
src/ex_cmds.c \
2728
src/ex_cmds.h \
2829
src/ex_cmds2.c \
@@ -84,6 +85,7 @@ SRC_ALL = \
8485
src/termlib.c \
8586
src/ui.c \
8687
src/undo.c \
88+
src/userfunc.c \
8789
src/version.c \
8890
src/version.h \
8991
src/vim.h \
@@ -133,6 +135,7 @@ SRC_ALL = \
133135
src/proto/digraph.pro \
134136
src/proto/edit.pro \
135137
src/proto/eval.pro \
138+
src/proto/evalfunc.pro \
136139
src/proto/ex_cmds.pro \
137140
src/proto/ex_cmds2.pro \
138141
src/proto/ex_docmd.pro \
@@ -175,6 +178,7 @@ SRC_ALL = \
175178
src/proto/termlib.pro \
176179
src/proto/ui.pro \
177180
src/proto/undo.pro \
181+
src/proto/userfunc.pro \
178182
src/proto/version.pro \
179183
src/proto/winclip.pro \
180184
src/proto/window.pro \

‎src/Make_bc5.mak‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -543,10 +543,12 @@ vimobj = \
543543
$(OBJDIR)\charset.obj \
544544
$(OBJDIR)\crypt.obj \
545545
$(OBJDIR)\crypt_zip.obj \
546+
$(OBJDIR)\dict.obj \
546547
$(OBJDIR)\diff.obj \
547548
$(OBJDIR)\digraph.obj \
548549
$(OBJDIR)\edit.obj \
549550
$(OBJDIR)\eval.obj \
551+
$(OBJDIR)\evalfunc.obj \
550552
$(OBJDIR)\ex_cmds.obj \
551553
$(OBJDIR)\ex_cmds2.obj \
552554
$(OBJDIR)\ex_docmd.obj \
@@ -559,6 +561,7 @@ vimobj = \
559561
$(OBJDIR)\hardcopy.obj \
560562
$(OBJDIR)\hashtab.obj \
561563
$(OBJDIR)\json.obj \
564+
$(OBJDIR)\list.obj \
562565
$(OBJDIR)\main.obj \
563566
$(OBJDIR)\mark.obj \
564567
$(OBJDIR)\memfile.obj \
@@ -584,6 +587,7 @@ vimobj = \
584587
$(OBJDIR)\term.obj \
585588
$(OBJDIR)\ui.obj \
586589
$(OBJDIR)\undo.obj \
590+
$(OBJDIR)\userfunc.obj \
587591
$(OBJDIR)\version.obj \
588592
$(OBJDIR)\window.obj \
589593
$(OBJDIR)\pathdef.obj

‎src/Make_cyg_ming.mak‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -610,10 +610,12 @@ OBJ = \
610610
$(OUTDIR)/charset.o \
611611
$(OUTDIR)/crypt.o \
612612
$(OUTDIR)/crypt_zip.o \
613+
$(OUTDIR)/dict.o \
613614
$(OUTDIR)/diff.o \
614615
$(OUTDIR)/digraph.o \
615616
$(OUTDIR)/edit.o \
616617
$(OUTDIR)/eval.o \
618+
$(OUTDIR)/evalfunc.o \
617619
$(OUTDIR)/ex_cmds.o \
618620
$(OUTDIR)/ex_cmds2.o \
619621
$(OUTDIR)/ex_docmd.o \
@@ -626,6 +628,7 @@ OBJ = \
626628
$(OUTDIR)/hardcopy.o \
627629
$(OUTDIR)/hashtab.o \
628630
$(OUTDIR)/json.o \
631+
$(OUTDIR)/list.o \
629632
$(OUTDIR)/main.o \
630633
$(OUTDIR)/mark.o \
631634
$(OUTDIR)/memfile.o \
@@ -655,6 +658,7 @@ OBJ = \
655658
$(OUTDIR)/term.o \
656659
$(OUTDIR)/ui.o \
657660
$(OUTDIR)/undo.o \
661+
$(OUTDIR)/userfunc.o \
658662
$(OUTDIR)/version.o \
659663
$(OUTDIR)/vimrc.o \
660664
$(OUTDIR)/window.o

‎src/Make_dice.mak‎

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,12 @@ SRC = \
3232
charset.c \
3333
crypt.c \
3434
crypt_zip.c \
35+
dict.c \
3536
diff.c \
3637
digraph.c \
3738
edit.c \
3839
eval.c \
40+
evalfunc.c \
3941
ex_cmds.c \
4042
ex_cmds2.c \
4143
ex_docmd.c \
@@ -48,6 +50,7 @@ SRC = \
4850
hardcopy.c \
4951
hashtab.c \
5052
json.c \
53+
list.c \
5154
main.c \
5255
mark.c \
5356
memfile.c \
@@ -74,6 +77,7 @@ SRC = \
7477
term.c \
7578
ui.c \
7679
undo.c \
80+
userfunc.c \
7781
window.c \
7882
version.c
7983

@@ -83,10 +87,12 @@ OBJ = o/arabic.o \
8387
o/charset.o \
8488
o/crypt.o \
8589
o/crypt_zip.o \
90+
o/dict.o \
8691
o/diff.o \
8792
o/digraph.o \
8893
o/edit.o \
8994
o/eval.o \
95+
o/evalfunc.o \
9096
o/ex_cmds.o \
9197
o/ex_cmds2.o \
9298
o/ex_docmd.o \
@@ -99,6 +105,7 @@ OBJ = o/arabic.o \
99105
o/hardcopy.o \
100106
o/hashtab.o \
101107
o/json.o \
108+
o/list.o \
102109
o/main.o \
103110
o/mark.o \
104111
o/memfile.o \
@@ -125,6 +132,7 @@ OBJ = o/arabic.o \
125132
o/term.o \
126133
o/ui.o \
127134
o/undo.o \
135+
o/userfunc.o \
128136
o/window.o \
129137
$(TERMLIB)
130138

@@ -159,6 +167,8 @@ o/crypt.o: crypt.c $(SYMS)
159167

160168
o/crypt_zip.o: crypt_zip.c $(SYMS)
161169

170+
o/dict.o: dict.c $(SYMS)
171+
162172
o/diff.o: diff.c $(SYMS)
163173

164174
o/digraph.o: digraph.c $(SYMS)
@@ -167,6 +177,8 @@ o/edit.o: edit.c $(SYMS)
167177

168178
o/eval.o: eval.c $(SYMS)
169179

180+
o/evalfunc.o: evalfunc.c $(SYMS)
181+
170182
o/ex_cmds.o: ex_cmds.c $(SYMS)
171183

172184
o/ex_cmds2.o: ex_cmds2.c $(SYMS)
@@ -191,6 +203,8 @@ o/hashtab.o: hashtab.c $(SYMS)
191203

192204
o/json.o: json.c $(SYMS)
193205

206+
o/list.o: list.c $(SYMS)
207+
194208
o/main.o: main.c $(SYMS)
195209

196210
o/mark.o: mark.c $(SYMS)
@@ -246,8 +260,10 @@ o/term.o: term.c $(SYMS) term.h
246260

247261
o/termlib.o: termlib.c $(SYMS)
248262

249-
o/ui.o: ui.c $(SYMS)
263+
o/ui.o: ui.c $(SYMS)
264+
265+
o/undo.o: undo.c $(SYMS)
250266

251-
o/undo.o: undo.c $(SYMS)
267+
o/userfunc.o: userfunc.c $(SYMS)
252268

253-
o/window.o: window.c $(SYMS)
269+
o/window.o: window.c $(SYMS)

‎src/Make_ivc.mak‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,10 +216,12 @@ LINK32_OBJS= \
216216
"$(INTDIR)/charset.obj" \
217217
"$(INTDIR)/crypt.obj" \
218218
"$(INTDIR)/crypt_zip.obj" \
219+
"$(INTDIR)/dict.obj" \
219220
"$(INTDIR)/diff.obj" \
220221
"$(INTDIR)/digraph.obj" \
221222
"$(INTDIR)/edit.obj" \
222223
"$(INTDIR)/eval.obj" \
224+
"$(INTDIR)/evalfunc.obj" \
223225
"$(INTDIR)/ex_cmds.obj" \
224226
"$(INTDIR)/ex_cmds2.obj" \
225227
"$(INTDIR)/ex_docmd.obj" \
@@ -232,6 +234,7 @@ LINK32_OBJS= \
232234
"$(INTDIR)/hardcopy.obj" \
233235
"$(INTDIR)/hashtab.obj" \
234236
"$(INTDIR)/json.obj" \
237+
"$(INTDIR)/list.obj" \
235238
"$(INTDIR)/main.obj" \
236239
"$(INTDIR)/mark.obj" \
237240
"$(INTDIR)/mbyte.obj" \
@@ -260,6 +263,7 @@ LINK32_OBJS= \
260263
"$(INTDIR)/term.obj" \
261264
"$(INTDIR)/ui.obj" \
262265
"$(INTDIR)/undo.obj" \
266+
"$(INTDIR)/userfunc.obj" \
263267
"$(INTDIR)/version.obj" \
264268
"$(INTDIR)/window.obj"
265269

@@ -356,6 +360,10 @@ SOURCE=.\crypt_zip.c
356360
# End Source File
357361
# Begin Source File
358362

363+
SOURCE=.\dict.c
364+
# End Source File
365+
# Begin Source File
366+
359367
SOURCE=.\diff.c
360368
# End Source File
361369
# Begin Source File
@@ -372,6 +380,10 @@ SOURCE=.\eval.c
372380
# End Source File
373381
# Begin Source File
374382

383+
SOURCE=.\evalfunc.c
384+
# End Source File
385+
# Begin Source File
386+
375387
SOURCE=.\ex_cmds.c
376388
# End Source File
377389
# Begin Source File
@@ -570,6 +582,10 @@ SOURCE=.\json.c
570582
# End Source File
571583
# Begin Source File
572584

585+
SOURCE=.\list.c
586+
# End Source File
587+
# Begin Source File
588+
573589
SOURCE=.\main.c
574590
# End Source File
575591
# Begin Source File
@@ -682,6 +698,10 @@ SOURCE=.\undo.c
682698
# End Source File
683699
# Begin Source File
684700

701+
SOURCE=.\userfunc.c
702+
# End Source File
703+
# Begin Source File
704+
685705
SOURCE=.\version.c
686706
# End Source File
687707
# Begin Source File

‎src/Make_manx.mak‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,12 @@ SRC = arabic.c \
4242
charset.c \
4343
crypt.c \
4444
crypt_zip.c \
45+
dict.c \
4546
diff.c \
4647
digraph.c \
4748
edit.c \
4849
eval.c \
50+
evalfunc.c \
4951
ex_cmds.c \
5052
ex_cmds2.c \
5153
ex_docmd.c \
@@ -58,6 +60,7 @@ SRC = arabic.c \
5860
hardcopy.c \
5961
hashtab.c \
6062
json.c \
63+
list.c \
6164
main.c \
6265
mark.c \
6366
memfile.c \
@@ -84,6 +87,7 @@ SRC = arabic.c \
8487
term.c \
8588
ui.c \
8689
undo.c \
90+
userfunc.c \
8791
window.c \
8892
version.c
8993

@@ -95,10 +99,12 @@ OBJ = obj/arabic.o \
9599
obj/charset.o \
96100
obj/crypt.o \
97101
obj/crypt_zip.o \
102+
obj/dict.o \
98103
obj/diff.o \
99104
obj/digraph.o \
100105
obj/edit.o \
101106
obj/eval.o \
107+
obj/evalfunc.o \
102108
obj/ex_cmds.o \
103109
obj/ex_cmds2.o \
104110
obj/ex_docmd.o \
@@ -111,6 +117,7 @@ OBJ = obj/arabic.o \
111117
obj/hardcopy.o \
112118
obj/hashtab.o \
113119
obj/json.o \
120+
obj/list.o \
114121
obj/main.o \
115122
obj/mark.o \
116123
obj/memfile.o \
@@ -137,6 +144,7 @@ OBJ = obj/arabic.o \
137144
obj/term.o \
138145
obj/ui.o \
139146
obj/undo.o \
147+
obj/userfunc.o \
140148
obj/window.o \
141149
$(TERMLIB)
142150

@@ -146,10 +154,12 @@ PRO = proto/arabic.pro \
146154
proto/charset.pro \
147155
proto/crypt.pro \
148156
proto/crypt_zip.pro \
157+
proto/dict.pro \
149158
proto/diff.pro \
150159
proto/digraph.pro \
151160
proto/edit.pro \
152161
proto/eval.pro \
162+
proto/evalfunc.pro \
153163
proto/ex_cmds.pro \
154164
proto/ex_cmds2.pro \
155165
proto/ex_docmd.pro \
@@ -162,6 +172,7 @@ PRO = proto/arabic.pro \
162172
proto/hardcopy.pro \
163173
proto/hashtab.pro \
164174
proto/json.pro \
175+
proto/list.pro \
165176
proto/main.pro \
166177
proto/mark.pro \
167178
proto/memfile.pro \
@@ -189,6 +200,7 @@ PRO = proto/arabic.pro \
189200
proto/termlib.pro \
190201
proto/ui.pro \
191202
proto/undo.pro \
203+
proto/userfunc.pro \
192204
proto/window.pro
193205

194206
all: Vim xxd/Xxd
@@ -253,6 +265,9 @@ obj/crypt.o: crypt.c
253265
obj/crypt_zip.o: crypt_zip.c
254266
$(CCSYM) $@ crypt_zip.c
255267

268+
obj/dict.o: dict.c
269+
$(CCSYM) $@ dict.c
270+
256271
obj/diff.o: diff.c
257272
$(CCSYM) $@ diff.c
258273

@@ -265,6 +280,9 @@ obj/edit.o: edit.c
265280
obj/eval.o: eval.c
266281
$(CCSYM) $@ eval.c
267282

283+
obj/evalfunc.o: evalfunc.c
284+
$(CCSYM) $@ evalfunc.c
285+
268286
obj/ex_cmds.o: ex_cmds.c
269287
$(CCSYM) $@ ex_cmds.c
270288

@@ -302,6 +320,9 @@ obj/hashtab.o: hashtab.c
302320
obj/json.o: json.c
303321
$(CCSYM) $@ json.c
304322

323+
obj/list.o: list.c
324+
$(CCSYM) $@ list.c
325+
305326
# Don't use $(SYMS) here, because main.c defines EXTERN
306327
obj/main.o: main.c option.h globals.h
307328
$(CCNOSYM) $@ main.c
@@ -386,5 +407,8 @@ obj/ui.o: ui.c
386407
obj/undo.o: undo.c
387408
$(CCSYM) $@ undo.c
388409

410+
obj/userfunc.o: userfunc.c
411+
$(CCSYM) $@ userfunc.c
412+
389413
obj/window.o: window.c
390414
$(CCSYM) $@ window.c

0 commit comments

Comments
 (0)