patch 7.4.1983
Problem: farsi.c and arabic.c are included in a strange way.
Solution: Build them like other files.
diff --git a/src/Makefile b/src/Makefile
index 79e2992..3aeac7d 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1478,6 +1478,7 @@
TAGS_INCL = *.h
BASIC_SRC = \
+ arabic.c \
blowfish.c \
buffer.c \
charset.c \
@@ -1492,6 +1493,7 @@
ex_docmd.c \
ex_eval.c \
ex_getln.c \
+ farsi.c \
fileio.c \
fold.c \
getchar.c \
@@ -1575,6 +1577,7 @@
#LINT_SRC = $(BASIC_SRC)
OBJ_COMMON = \
+ objects/arabic.o \
objects/buffer.o \
objects/blowfish.o \
objects/charset.o \
@@ -1589,6 +1592,7 @@
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,6 +1656,7 @@
objects/memfile_test.o
PRO_AUTO = \
+ arabic.pro \
blowfish.pro \
buffer.pro \
charset.pro \
@@ -1666,6 +1671,7 @@
ex_docmd.pro \
ex_eval.pro \
ex_getln.pro \
+ farsi.pro \
fileio.pro \
fold.pro \
getchar.pro \
@@ -2749,6 +2755,9 @@
objects:
mkdir objects
+objects/arabic.o: arabic.c
+ $(CCC) -o $@ arabic.c
+
objects/blowfish.o: blowfish.c
$(CCC) -o $@ blowfish.c
@@ -2791,6 +2800,9 @@
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,6 +3122,10 @@
###############################################################################
### (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,6 +3182,10 @@
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,7 +3221,7 @@
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
+ 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,10 +3334,10 @@
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.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,11 +3414,11 @@
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
+ 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 farsi.c arabic.c memfile.c
+ 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 \