To: vim_dev@googlegroups.com Subject: Patch 7.4.1983 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 7.4.1983 Problem: farsi.c and arabic.c are included in a strange way. Solution: Build them like other files. Files: src/main.c, src/farsi.c, src/arabic.c, src/proto.h, src/proto/main.pro, src/proto/farsi.pro, src/proto/arabic.pro, src/Makefile, 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, Make_vms.mms, Filelist *** ../vim-7.4.1982/src/main.c 2016-07-01 17:17:13.286266820 +0200 --- src/main.c 2016-07-02 19:44:30.875268738 +0200 *************** *** 4186,4202 **** return res; } #endif - - /* - * When FEAT_FKMAP is defined, also compile the Farsi source code. - */ - #if defined(FEAT_FKMAP) || defined(PROTO) - # include "farsi.c" - #endif - - /* - * When FEAT_ARABIC is defined, also compile the Arabic source code. - */ - #if defined(FEAT_ARABIC) || defined(PROTO) - # include "arabic.c" - #endif --- 4186,4188 ---- *** ../vim-7.4.1982/src/farsi.c 2016-07-02 18:25:15.720879205 +0200 --- src/farsi.c 2016-07-02 19:42:01.805456320 +0200 *************** *** 9,18 **** /* * farsi.c: functions for Farsi language - * - * Included by main.c, when FEAT_FKMAP is defined. */ static int toF_Xor_X_(int c); static int F_is_TyE(int c); static int F_is_TyC_TyD(int c); --- 9,20 ---- /* * farsi.c: functions for Farsi language */ + #include "vim.h" + + #if defined(FEAT_FKMAP) || defined(PROTO) + static int toF_Xor_X_(int c); static int F_is_TyE(int c); static int F_is_TyC_TyD(int c); *************** *** 2189,2191 **** --- 2191,2195 ---- conv_to_pstd(); } } + + #endif /* FEAT_FKMAP */ *** ../vim-7.4.1982/src/arabic.c 2016-01-30 15:14:02.527449037 +0100 --- src/arabic.c 2016-07-02 19:44:22.507391523 +0200 *************** *** 10,23 **** /* * arabic.c: functions for Arabic language * - * Included by main.c, when FEAT_ARABIC & FEAT_GUI is defined. - * - * -- - * * Author: Nadim Shaikli & Isam Bayazidi - * */ static int A_is_a(int cur_c); static int A_is_s(int cur_c); static int A_is_f(int cur_c); --- 10,22 ---- /* * arabic.c: functions for Arabic language * * Author: Nadim Shaikli & Isam Bayazidi */ + #include "vim.h" + + #if defined(FEAT_ARABIC) || defined(PROTO) + static int A_is_a(int cur_c); static int A_is_s(int cur_c); static int A_is_f(int cur_c); *************** *** 1148,1150 **** --- 1147,1151 ---- { return (c == a_HAMZA || c == a_s_HAMZA); } + + #endif /* FEAT_ARABIC */ *** ../vim-7.4.1982/src/proto.h 2016-03-11 22:52:00.742438030 +0100 --- src/proto.h 2016-07-02 19:45:44.026195430 +0200 *************** *** 92,97 **** --- 92,103 ---- # ifdef FEAT_MENU # include "menu.pro" # endif + # ifdef FEAT_FKMAP + # include "farsi.pro" + # endif + # ifdef FEAT_ARABIC + # include "arabic.pro" + # endif /* These prototypes cannot be produced automatically. */ int *** ../vim-7.4.1982/src/proto/main.pro 2016-07-02 18:25:15.724879148 +0200 --- src/proto/main.pro 2016-07-02 19:44:56.862887422 +0200 *************** *** 10,24 **** void server_to_input_buf(char_u *str); char_u *eval_client_expr_to_string(char_u *expr); char_u *serverConvert(char_u *client_enc, char_u *data, char_u **tofree); - int fkmap(int c); - char_u *lrswap(char_u *ibuf); - char_u *lrFswap(char_u *cmdbuf, int len); - char_u *lrF_sub(char_u *ibuf); - int cmdl_fkmap(int c); - int F_isalpha(int c); - int F_isdigit(int c); - int F_ischar(int c); - void farsi_f8(cmdarg_T *cap); - void farsi_f9(cmdarg_T *cap); - int arabic_shape(int c, int *ccp, int *c1p, int prev_c, int prev_c1, int next_c); /* vim: set ft=c : */ --- 10,13 ---- *** ../vim-7.4.1982/src/proto/farsi.pro 2016-07-02 20:25:49.838905442 +0200 --- src/proto/farsi.pro 2016-07-02 19:47:09.604939918 +0200 *************** *** 0 **** --- 1,12 ---- + /* farsi.c */ + int fkmap(int c); + char_u *lrswap(char_u *ibuf); + char_u *lrFswap(char_u *cmdbuf, int len); + char_u *lrF_sub(char_u *ibuf); + int cmdl_fkmap(int c); + int F_isalpha(int c); + int F_isdigit(int c); + int F_ischar(int c); + void farsi_f8(cmdarg_T *cap); + void farsi_f9(cmdarg_T *cap); + /* vim: set ft=c : */ *** ../vim-7.4.1982/src/proto/arabic.pro 2016-07-02 20:25:49.842905384 +0200 --- src/proto/arabic.pro 2016-07-02 19:47:13.168887635 +0200 *************** *** 0 **** --- 1,3 ---- + /* arabic.c */ + int arabic_shape(int c, int *ccp, int *c1p, int prev_c, int prev_c1, int next_c); + /* vim: set ft=c : */ *** ../vim-7.4.1982/src/Makefile 2016-07-02 18:25:15.720879205 +0200 --- src/Makefile 2016-07-02 19:50:28.734019099 +0200 *************** *** 1478,1483 **** --- 1478,1484 ---- TAGS_INCL = *.h BASIC_SRC = \ + arabic.c \ blowfish.c \ buffer.c \ charset.c \ *************** *** 1492,1497 **** --- 1493,1499 ---- ex_docmd.c \ ex_eval.c \ ex_getln.c \ + farsi.c \ fileio.c \ fold.c \ getchar.c \ *************** *** 1575,1580 **** --- 1577,1583 ---- #LINT_SRC = $(BASIC_SRC) OBJ_COMMON = \ + objects/arabic.o \ objects/buffer.o \ objects/blowfish.o \ objects/charset.o \ *************** *** 1589,1594 **** --- 1592,1598 ---- objects/ex_docmd.o \ objects/ex_eval.o \ objects/ex_getln.o \ + objects/farsi.o \ objects/fileio.o \ objects/fold.o \ objects/getchar.o \ *************** *** 1652,1657 **** --- 1656,1662 ---- objects/memfile_test.o PRO_AUTO = \ + arabic.pro \ blowfish.pro \ buffer.pro \ charset.pro \ *************** *** 1666,1671 **** --- 1671,1677 ---- ex_docmd.pro \ ex_eval.pro \ ex_getln.pro \ + farsi.pro \ fileio.pro \ fold.pro \ getchar.pro \ *************** *** 2749,2754 **** --- 2755,2763 ---- objects: mkdir objects + objects/arabic.o: arabic.c + $(CCC) -o $@ arabic.c + objects/blowfish.o: blowfish.c $(CCC) -o $@ blowfish.c *************** *** 2791,2796 **** --- 2800,2808 ---- objects/ex_getln.o: ex_getln.c $(CCC) -o $@ ex_getln.c + objects/farsi.o: farsi.c + $(CCC) -o $@ farsi.c + objects/fileio.o: fileio.c $(CCC) -o $@ fileio.c *************** *** 3110,3115 **** --- 3122,3131 ---- ############################################################################### ### (automatically generated by 'make depend') ### Dependencies: + objects/arabic.o: arabic.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 alloc.h ex_cmds.h proto.h globals.h \ + farsi.h arabic.h objects/blowfish.o: blowfish.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 alloc.h ex_cmds.h proto.h \ *************** *** 3166,3171 **** --- 3182,3191 ---- 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 alloc.h ex_cmds.h proto.h \ globals.h farsi.h arabic.h + objects/farsi.o: farsi.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 alloc.h ex_cmds.h proto.h globals.h \ + farsi.h arabic.h objects/fileio.o: fileio.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 alloc.h ex_cmds.h proto.h globals.h \ *************** *** 3201,3207 **** objects/main.o: main.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 alloc.h ex_cmds.h proto.h globals.h \ ! farsi.h arabic.h farsi.c arabic.c objects/mark.o: mark.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 alloc.h ex_cmds.h proto.h globals.h \ --- 3221,3227 ---- objects/main.o: main.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 alloc.h ex_cmds.h proto.h globals.h \ ! farsi.h arabic.h objects/mark.o: mark.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 alloc.h ex_cmds.h proto.h globals.h \ *************** *** 3314,3323 **** objects/gui.o: gui.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 alloc.h ex_cmds.h proto.h globals.h farsi.h arabic.h ! objects/gui_gtk.o: gui_gtk.c gui_gtk_f.h 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 alloc.h ex_cmds.h proto.h \ ! globals.h farsi.h arabic.h 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 alloc.h ex_cmds.h proto.h \ --- 3334,3343 ---- objects/gui.o: gui.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 alloc.h ex_cmds.h proto.h globals.h farsi.h arabic.h ! objects/gui_gtk.o: gui_gtk.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 alloc.h ex_cmds.h proto.h globals.h \ ! farsi.h arabic.h gui_gtk_f.h 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 alloc.h ex_cmds.h proto.h \ *************** *** 3394,3404 **** objects/json_test.o: json_test.c main.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 alloc.h ex_cmds.h proto.h \ ! globals.h farsi.h arabic.h farsi.c arabic.c json.c objects/memfile_test.o: memfile_test.c main.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 alloc.h \ ! ex_cmds.h proto.h globals.h farsi.h arabic.h farsi.c arabic.c memfile.c objects/hangulin.o: hangulin.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 alloc.h ex_cmds.h proto.h \ --- 3414,3424 ---- objects/json_test.o: json_test.c main.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 alloc.h ex_cmds.h proto.h \ ! globals.h farsi.h arabic.h json.c objects/memfile_test.o: memfile_test.c main.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 alloc.h \ ! ex_cmds.h proto.h globals.h farsi.h arabic.h memfile.c objects/hangulin.o: hangulin.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 alloc.h ex_cmds.h proto.h \ *** ../vim-7.4.1982/src/Make_bc5.mak 2016-03-11 22:52:00.742438030 +0100 --- src/Make_bc5.mak 2016-07-02 19:51:43.092928605 +0200 *************** *** 537,542 **** --- 537,543 ---- !endif vimobj = \ + $(OBJDIR)\arabic.obj \ $(OBJDIR)\blowfish.obj \ $(OBJDIR)\buffer.obj \ $(OBJDIR)\charset.obj \ *************** *** 551,556 **** --- 552,558 ---- $(OBJDIR)\ex_docmd.obj \ $(OBJDIR)\ex_eval.obj \ $(OBJDIR)\ex_getln.obj \ + $(OBJDIR)\farsi.obj \ $(OBJDIR)\fileio.obj \ $(OBJDIR)\fold.obj \ $(OBJDIR)\getchar.obj \ *** ../vim-7.4.1982/src/Make_cyg_ming.mak 2016-07-01 18:16:47.481936426 +0200 --- src/Make_cyg_ming.mak 2016-07-02 19:51:55.748743015 +0200 *************** *** 594,599 **** --- 594,600 ---- GUIOBJ = $(OUTDIR)/gui.o $(OUTDIR)/gui_w32.o $(OUTDIR)/gui_beval.o $(OUTDIR)/os_w32exe.o CUIOBJ = $(OUTDIR)/iscygpty.o OBJ = \ + $(OUTDIR)/arabic.o \ $(OUTDIR)/blowfish.o \ $(OUTDIR)/buffer.o \ $(OUTDIR)/charset.o \ *************** *** 608,613 **** --- 609,615 ---- $(OUTDIR)/ex_docmd.o \ $(OUTDIR)/ex_eval.o \ $(OUTDIR)/ex_getln.o \ + $(OUTDIR)/farsi.o \ $(OUTDIR)/fileio.o \ $(OUTDIR)/fold.o \ $(OUTDIR)/getchar.o \ *** ../vim-7.4.1982/src/Make_dice.mak 2016-01-23 19:45:48.622931332 +0100 --- src/Make_dice.mak 2016-07-02 19:53:03.223753583 +0200 *************** *** 26,31 **** --- 26,32 ---- ${CC} ${PRE} ${CFLAGS} $< -o $@ SRC = \ + arabic.c \ blowfish.c \ buffer.c \ charset.c \ *************** *** 40,45 **** --- 41,47 ---- ex_docmd.c \ ex_eval.c \ ex_getln.c \ + farsi.c \ fileio.c \ fold.c \ getchar.c \ *************** *** 75,81 **** window.c \ version.c ! OBJ = o/blowfish.o \ o/buffer.o \ o/charset.o \ o/crypt.o \ --- 77,84 ---- window.c \ version.c ! OBJ = o/arabic.o \ ! o/blowfish.o \ o/buffer.o \ o/charset.o \ o/crypt.o \ *************** *** 89,94 **** --- 92,98 ---- o/ex_docmd.o \ o/ex_eval.o \ o/ex_getln.o \ + o/farsi.o \ o/fileio.o \ o/fold.o \ o/getchar.o \ *************** *** 143,148 **** --- 147,154 ---- ########################################################################### + o/arabic.o: arabic.c $(SYMS) + o/blowfish.o: blowfish.c $(SYMS) o/buffer.o: buffer.c $(SYMS) *************** *** 171,176 **** --- 177,184 ---- o/ex_getln.o: ex_getln.c $(SYMS) + o/farsi.o: farsi.c $(SYMS) + o/fileio.o: fileio.c $(SYMS) o/fold.o: fold.c $(SYMS) *** ../vim-7.4.1982/src/Make_ivc.mak 2016-01-23 19:45:48.622931332 +0100 --- src/Make_ivc.mak 2016-07-02 19:53:51.363047736 +0200 *************** *** 210,215 **** --- 210,216 ---- LINK32_OBJS= \ $(EXTRAS) \ + "$(INTDIR)/arabic.obj" \ "$(INTDIR)/blowfish.obj" \ "$(INTDIR)/buffer.obj" \ "$(INTDIR)/charset.obj" \ *************** *** 224,229 **** --- 225,231 ---- "$(INTDIR)/ex_docmd.obj" \ "$(INTDIR)/ex_eval.obj" \ "$(INTDIR)/ex_getln.obj" \ + "$(INTDIR)/farsi.obj" \ "$(INTDIR)/fileio.obj" \ "$(INTDIR)/fold.obj" \ "$(INTDIR)/getchar.obj" \ *************** *** 330,335 **** --- 332,341 ---- # Begin Source File + SOURCE=.\arabic.c + # End Source File + # Begin Source File + SOURCE=.\blowfish.c # End Source File # Begin Source File *************** *** 386,391 **** --- 392,401 ---- # End Source File # Begin Source File + SOURCE=.\farsi.c + # End Source File + # Begin Source File + SOURCE=.\fileio.c # End Source File # Begin Source File *** ../vim-7.4.1982/src/Make_manx.mak 2016-01-23 19:45:48.622931332 +0100 --- src/Make_manx.mak 2016-07-02 19:55:04.245979164 +0200 *************** *** 36,42 **** REN = $(SHELL) -c mv -f DEL = $(SHELL) -c rm -f ! SRC = blowfish.c \ buffer.c \ charset.c \ crypt.c \ --- 36,43 ---- REN = $(SHELL) -c mv -f DEL = $(SHELL) -c rm -f ! SRC = arabic.c \ ! blowfish.c \ buffer.c \ charset.c \ crypt.c \ *************** *** 50,55 **** --- 51,57 ---- ex_docmd.c \ ex_eval.c \ ex_getln.c \ + farsi.c \ fileio.c \ fold.c \ getchar.c \ *************** *** 87,93 **** INCL = vim.h feature.h keymap.h macros.h ascii.h term.h structs.h os_amiga.h ! OBJ = obj/blowfish.o \ obj/buffer.o \ obj/charset.o \ obj/crypt.o \ --- 89,96 ---- INCL = vim.h feature.h keymap.h macros.h ascii.h term.h structs.h os_amiga.h ! OBJ = obj/arabic.o \ ! obj/blowfish.o \ obj/buffer.o \ obj/charset.o \ obj/crypt.o \ *************** *** 101,106 **** --- 104,110 ---- obj/ex_docmd.o \ obj/ex_eval.o \ obj/ex_getln.o \ + obj/farsi.o \ obj/fileio.o \ obj/fold.o \ obj/getchar.o \ *************** *** 136,142 **** obj/window.o \ $(TERMLIB) ! PRO = proto/blowfish.pro \ proto/buffer.pro \ proto/charset.pro \ proto/crypt.pro \ --- 140,147 ---- obj/window.o \ $(TERMLIB) ! PRO = proto/arabic.pro \ ! proto/blowfish.pro \ proto/buffer.pro \ proto/charset.pro \ proto/crypt.pro \ *************** *** 150,155 **** --- 155,161 ---- proto/ex_docmd.pro \ proto/ex_eval.pro \ proto/ex_getln.pro \ + proto/farsi.pro \ proto/fileio.pro \ proto/fold.pro \ proto/getchar.pro \ *************** *** 229,234 **** --- 235,243 ---- $(OBJ): $(SYMS) + obj/arabic.o: arabic.c + $(CCSYM) $@ arabic.c + obj/blowfish.o: blowfish.c $(CCSYM) $@ blowfish.c *************** *** 272,277 **** --- 281,289 ---- obj/ex_getln.o: ex_getln.c $(CCSYM) $@ ex_getln.c + obj/farsi.o: farsi.c + $(CCSYM) $@ farsi.c + obj/fileio.o: fileio.c $(CCSYM) $@ fileio.c *** ../vim-7.4.1982/src/Make_morph.mak 2016-01-23 19:45:48.622931332 +0100 --- src/Make_morph.mak 2016-07-02 19:55:53.773253078 +0200 *************** *** 24,30 **** .c.o: ${CC} ${CFLAGS} $< -o $@ ! SRC = blowfish.c \ buffer.c \ charset.c \ crypt.c \ --- 24,31 ---- .c.o: ${CC} ${CFLAGS} $< -o $@ ! SRC = arabic.c \ ! blowfish.c \ buffer.c \ charset.c \ crypt.c \ *************** *** 38,43 **** --- 39,45 ---- ex_docmd.c \ ex_eval.c \ ex_getln.c \ + farsi.c \ fileio.c \ fold.c \ getchar.c \ *** ../vim-7.4.1982/src/Make_mvc.mak 2016-07-01 18:16:47.481936426 +0200 --- src/Make_mvc.mak 2016-07-02 19:56:49.888430463 +0200 *************** *** 548,553 **** --- 548,554 ---- $(NBDEBUG_INCL) OBJ = \ + $(OUTDIR)\arabic.obj \ $(OUTDIR)\blowfish.obj \ $(OUTDIR)\buffer.obj \ $(OUTDIR)\charset.obj \ *************** *** 562,567 **** --- 563,569 ---- $(OUTDIR)\ex_docmd.obj \ $(OUTDIR)\ex_eval.obj \ $(OUTDIR)\ex_getln.obj \ + $(OUTDIR)\farsi.obj \ $(OUTDIR)\fileio.obj \ $(OUTDIR)\fold.obj \ $(OUTDIR)\getchar.obj \ *************** *** 1148,1153 **** --- 1150,1157 ---- !ENDIF $(CC) $(CFLAGS) $< + $(OUTDIR)/arabic.obj: $(OUTDIR) arabic.c $(INCL) + $(OUTDIR)/blowfish.obj: $(OUTDIR) blowfish.c $(INCL) $(OUTDIR)/buffer.obj: $(OUTDIR) buffer.c $(INCL) *************** *** 1176,1181 **** --- 1180,1187 ---- $(OUTDIR)/ex_getln.obj: $(OUTDIR) ex_getln.c $(INCL) + $(OUTDIR)/farsi.obj: $(OUTDIR) farsi.c $(INCL) + $(OUTDIR)/fileio.obj: $(OUTDIR) fileio.c $(INCL) $(OUTDIR)/fold.obj: $(OUTDIR) fold.c $(INCL) *************** *** 1346,1351 **** --- 1352,1358 ---- # End Custom Build proto.h: \ + proto/arabic.pro \ proto/blowfish.pro \ proto/buffer.pro \ proto/charset.pro \ *************** *** 1360,1365 **** --- 1367,1373 ---- proto/ex_docmd.pro \ proto/ex_eval.pro \ proto/ex_getln.pro \ + proto/farsi.pro \ proto/fileio.pro \ proto/getchar.pro \ proto/hardcopy.pro \ *** ../vim-7.4.1982/src/Make_sas.mak 2016-01-23 19:45:48.626931291 +0100 --- src/Make_sas.mak 2016-07-02 19:57:52.139517963 +0200 *************** *** 89,94 **** --- 89,95 ---- PROPT = DEF=PROTO GPROTO GPPARM MAXIMUMERRORS=999 GENPROTOSTATICS GENPROTOPARAMETERS SRC = \ + arabic.c \ blowfish.c \ buffer.c \ charset.c \ *************** *** 103,108 **** --- 104,110 ---- ex_docmd.c \ ex_eval.c \ ex_getln.c \ + farsi.c \ fileio.c \ fold.c \ getchar.c \ *************** *** 139,144 **** --- 141,147 ---- version.c OBJ = \ + arabic.o \ blowfish.o \ buffer.o \ charset.o \ *************** *** 153,158 **** --- 156,162 ---- ex_docmd.o \ ex_eval.o \ ex_getln.o \ + farsi.o \ fileio.o \ fold.o \ getchar.o \ *************** *** 189,194 **** --- 193,199 ---- $(TERMLIB) PRO = \ + proto/arabic.pro \ proto/blowfish.pro \ proto/buffer.pro \ proto/charset.pro \ *************** *** 203,208 **** --- 208,214 ---- proto/ex_docmd.pro \ proto/ex_eval.pro \ proto/ex_getln.pro \ + proto/farsi.pro \ proto/fileio.pro \ proto/fold.pro \ proto/getchar.pro \ *************** *** 293,298 **** --- 299,306 ---- $(CC) $(CFLAGS) GPFILE=proto/$*.pro $(PROPT) $*.c # dependencies + arabic.o: arabic.c + proto/arabic.pro: arabic.c blowfish.o: blowfish.c proto/blowfish.pro: blowfish.c buffer.o: buffer.c *************** *** 321,326 **** --- 329,336 ---- proto/ex_eval.pro: ex_eval.c ex_cmds.h ex_getln.o: ex_getln.c proto/ex_getln.pro: ex_getln.c + farsi.o: farsi.c + proto/farsi.pro: farsi.c fileio.o: fileio.c proto/fileio.pro: fileio.c fold.o: fold.c *** ../vim-7.4.1982/Filelist 2016-06-26 20:37:24.571968881 +0200 --- Filelist 2016-07-02 19:48:21.491885391 +0200 *************** *** 116,121 **** --- 116,122 ---- src/testdir/bench*.vim \ src/testdir/samples/*.txt \ src/proto.h \ + src/proto/arabic.pro \ src/proto/blowfish.pro \ src/proto/buffer.pro \ src/proto/channel.pro \ *************** *** 131,136 **** --- 132,138 ---- src/proto/ex_docmd.pro \ src/proto/ex_eval.pro \ src/proto/ex_getln.pro \ + src/proto/farsi.pro \ src/proto/fileio.pro \ src/proto/fold.pro \ src/proto/getchar.pro \ *** ../vim-7.4.1982/src/version.c 2016-07-02 19:20:02.152849060 +0200 --- src/version.c 2016-07-02 19:59:54.877717836 +0200 *************** *** 760,761 **** --- 760,763 ---- { /* Add new patch number below this line */ + /**/ + 1983, /**/ -- hundred-and-one symptoms of being an internet addict: 183. You move your coffeemaker next to your computer. /// Bram Moolenaar -- Bram@Moolenaar.net -- 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 ///