-diff -burN -x '*.orig' vim-6.2.532.orig/src/edit.c vim-6.2.532/src/edit.c
---- vim-6.2.532.orig/src/edit.c 2004-05-08 08:55:12.000000000 +0200
-+++ vim-6.2.532/src/edit.c 2004-05-08 09:25:12.218962464 +0200
+diff -urBbN vim64.org/src/edit.c vim64/src/edit.c
+--- vim64.org/src/edit.c 2005-04-08 11:16:31.000000000 +0200
++++ vim64/src/edit.c 2005-10-17 12:49:17.442845032 +0200
@@ -659,7 +659,11 @@
if ((c == Ctrl_V || c == Ctrl_Q) && ctrl_x_mode == CTRL_X_CMDLINE)
goto docomplete;
{
ins_ctrl_v();
c = Ctrl_V; /* pretend CTRL-V is last typed character */
-@@ -1229,6 +1233,20 @@
+@@ -1231,6 +1235,20 @@
continue_status = 0;
break;
#endif /* FEAT_INS_EXPAND */
case Ctrl_Y: /* copy from previous line or scroll down */
case Ctrl_E: /* copy from next line or scroll up */
-diff -burN -x '*.orig' vim-6.2.532.orig/src/eval.c vim-6.2.532/src/eval.c
---- vim-6.2.532.orig/src/eval.c 2004-05-08 08:55:12.000000000 +0200
-+++ vim-6.2.532/src/eval.c 2004-05-08 09:25:12.235959880 +0200
-@@ -4998,6 +4998,9 @@
+diff -urBbN vim64.org/src/eval.c vim64/src/eval.c
+--- vim64.org/src/eval.c 2004-07-28 11:53:18.000000000 +0200
++++ vim64/src/eval.c 2005-10-17 12:49:17.448844120 +0200
+@@ -4995,6 +4995,9 @@
#ifdef FEAT_SNIFF
"sniff",
#endif
#ifdef FEAT_STL_OPT
"statusline",
#endif
-diff -burN -x '*.orig' vim-6.2.532.orig/src/ex_cmds.h vim-6.2.532/src/ex_cmds.h
---- vim-6.2.532.orig/src/ex_cmds.h 2004-05-08 08:55:12.000000000 +0200
-+++ vim-6.2.532/src/ex_cmds.h 2004-05-08 09:25:12.241958968 +0200
+diff -urBbN vim64.org/src/ex_cmds.h vim64/src/ex_cmds.h
+--- vim64.org/src/ex_cmds.h 2004-08-30 14:58:51.000000000 +0200
++++ vim64/src/ex_cmds.h 2005-10-17 12:49:17.449843968 +0200
@@ -726,6 +726,8 @@
BANG|FILE1|TRLBAR|SBOXOK|CMDWIN),
EX(CMD_split, "split", ex_splitview,
EX(CMD_sprevious, "sprevious", ex_previous,
EXTRA|RANGE|NOTADR|COUNT|BANG|EDITCMD|ARGOPT|TRLBAR),
EX(CMD_srewind, "srewind", ex_rewind,
-diff -burN -x '*.orig' vim-6.2.532.orig/src/ex_docmd.c vim-6.2.532/src/ex_docmd.c
---- vim-6.2.532.orig/src/ex_docmd.c 2004-05-08 08:55:13.000000000 +0200
-+++ vim-6.2.532/src/ex_docmd.c 2004-05-08 09:25:12.266955168 +0200
+diff -urBbN vim64.org/src/ex_docmd.c vim64/src/ex_docmd.c
+--- vim64.org/src/ex_docmd.c 2005-10-08 16:24:04.000000000 +0200
++++ vim64/src/ex_docmd.c 2005-10-17 12:49:17.455843056 +0200
@@ -220,6 +220,9 @@
#ifndef FEAT_SYN_HL
# define ex_syntax ex_ni
#ifndef FEAT_PERL
# define ex_perl ex_script_ni
# define ex_perldo ex_ni
-@@ -3404,6 +3407,12 @@
+@@ -3413,6 +3416,12 @@
set_context_in_syntax_cmd(xp, arg);
break;
#endif
#ifdef FEAT_EVAL
case CMD_let:
case CMD_if:
-diff -burN -x '*.orig' vim-6.2.532.orig/src/feature.h vim-6.2.532/src/feature.h
---- vim-6.2.532.orig/src/feature.h 2004-05-08 08:55:11.000000000 +0200
-+++ vim-6.2.532/src/feature.h 2004-05-08 09:25:12.271954408 +0200
+diff -urBbN vim64.org/src/feature.h vim64/src/feature.h
+--- vim64.org/src/feature.h 2005-01-13 19:22:50.000000000 +0100
++++ vim64/src/feature.h 2005-10-17 12:49:17.457842752 +0200
@@ -314,6 +314,11 @@
# define FEAT_RIGHTLEFT
# endif
/*
* +arabic Arabic keymap and shaping support.
-diff -burN -x '*.orig' vim-6.2.532.orig/src/globals.h vim-6.2.532/src/globals.h
---- vim-6.2.532.orig/src/globals.h 2004-05-08 08:55:13.000000000 +0200
-+++ vim-6.2.532/src/globals.h 2004-05-08 09:25:12.274953952 +0200
-@@ -872,6 +872,9 @@
+diff -urBbN vim64.org/src/globals.h vim64/src/globals.h
+--- vim64.org/src/globals.h 2004-06-27 15:44:13.000000000 +0200
++++ vim64/src/globals.h 2005-10-17 12:49:17.458842600 +0200
+@@ -877,6 +877,9 @@
#ifdef USE_TERM_CONSOLE
EXTERN int term_console INIT(= FALSE); /* set to TRUE when console used */
#endif
EXTERN int termcap_active INIT(= FALSE); /* set by starttermcap() */
EXTERN int cur_tmode INIT(= TMODE_COOK); /* input terminal mode */
EXTERN int bangredo INIT(= FALSE); /* set to TRUE whith ! command */
-diff -burN -x '*.orig' vim-6.2.532.orig/src/main.c vim-6.2.532/src/main.c
---- vim-6.2.532.orig/src/main.c 2004-05-08 08:55:12.000000000 +0200
-+++ vim-6.2.532/src/main.c 2004-05-08 09:25:12.279953192 +0200
-@@ -2245,6 +2245,10 @@
+diff -urBbN vim64.org/src/main.c vim64/src/main.c
+--- vim64.org/src/main.c 2005-02-15 14:09:15.000000000 +0100
++++ vim64/src/main.c 2005-10-17 12:49:17.461842144 +0200
+@@ -2263,6 +2263,10 @@
write_viminfo(NULL, FALSE);
#endif
#ifdef FEAT_AUTOCMD
apply_autocmds(EVENT_VIMLEAVE, NULL, NULL, FALSE, curbuf);
#endif
-diff -burN -x '*.orig' vim-6.2.532.orig/src/Makefile vim-6.2.532/src/Makefile
---- vim-6.2.532.orig/src/Makefile 2004-05-08 08:55:11.000000000 +0200
-+++ vim-6.2.532/src/Makefile 2004-05-08 09:25:12.286952128 +0200
-@@ -1234,6 +1234,22 @@
+diff -urBbN vim64.org/src/Makefile vim64/src/Makefile
+--- vim64.org/src/Makefile 2005-10-15 13:52:15.000000000 +0200
++++ vim64/src/Makefile 2005-10-17 12:51:51.656401008 +0200
+@@ -1211,6 +1211,22 @@
# Use this for cproto 3 patchlevel 7 or above (use "cproto -V" to check):
PROTO_FLAGS = -m -M__ARGS -d -E"$(CPP)" $(NO_ATTR)
################################################
## no changes required below this line ##
-@@ -1244,7 +1260,7 @@
+@@ -1221,7 +1237,7 @@
.SUFFIXES:
.SUFFIXES: .cc .c .o .pro
POST_DEFS = $(X_CFLAGS) $(PERL_CFLAGS) $(PYTHON_CFLAGS) $(TCL_CFLAGS) $(RUBY_CFLAGS) $(EXTRA_DEFS)
ALL_CFLAGS = $(PRE_DEFS) $(CFLAGS) $(PROFILE_CFLAGS) $(POST_DEFS)
-@@ -1326,6 +1342,7 @@
+@@ -1305,6 +1321,7 @@
screen.c \
search.c \
syntax.c \
tag.c \
term.c \
ui.c \
-@@ -1392,6 +1409,7 @@
+@@ -1371,6 +1388,7 @@
objects/screen.o \
objects/search.o \
objects/syntax.o \
$(SNIFF_OBJ) \
objects/tag.o \
objects/term.o \
-@@ -2392,6 +2410,9 @@
+@@ -2327,6 +2345,9 @@
objects/undo.o: undo.c
$(CCC) -o $@ undo.c
objects/window.o: window.c
$(CCC) -o $@ window.c
-@@ -2649,6 +2670,9 @@
- auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \
- gui.h gui_beval.h proto/gui_beval.pro option.h ex_cmds.h proto.h \
- globals.h farsi.h arabic.h
+@@ -2561,6 +2582,9 @@
+ ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h gui_beval.h \
+ proto/gui_beval.pro option.h ex_cmds.h proto.h globals.h farsi.h \
+ arabic.h
+objects/spell.o: spell.c vim.h spell/config.h feature.h os_unix.h auto/osdef.h \
-+ ascii.h keymap.h term.h macros.h regexp.h structs.h gui.h globals.h farsi.h \
-+ option.h ex_cmds.h proto.h spell/local.h spell/wm.h spell/ispell.h
- objects/syntax.o: syntax.c vim.h auto/config.h feature.h os_unix.h \
- auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \
- gui.h gui_beval.h proto/gui_beval.pro option.h ex_cmds.h proto.h \
-@@ -2815,3 +2839,26 @@
- auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \
- gui.h gui_beval.h proto/gui_beval.pro option.h ex_cmds.h proto.h \
- globals.h farsi.h arabic.h version.h
++ ascii.h keymap.h term.h macros.h regexp.h structs.h gui.h globals.h farsi.h \
++ option.h ex_cmds.h proto.h spell/local.h spell/wm.h spell/ispell.h
+ objects/syntax.o: syntax.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
+ ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h gui_beval.h \
+ proto/gui_beval.pro option.h ex_cmds.h proto.h globals.h farsi.h \
+@@ -2691,3 +2715,27 @@
+ auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h \
+ gui_beval.h proto/gui_beval.pro option.h ex_cmds.h proto.h globals.h \
+ farsi.h arabic.h version.h
+
+SPELL_CFLAGS=$(CFLAGS) -pedantic -DUSG=1
+
+
+objects/hash.o: spell/hash.c spell/config.h spell/ispell.h spell/i_proto.h spell/local.h
+ $(CC) -c $(SPELL_CFLAGS) spell/hash.c -o objects/hash.o
-+
++
+objects/makedent.o: spell/makedent.c spell/config.h spell/ispell.h spell/i_proto.h spell/msgs.h spell/local.h
+ $(CC) -c $(SPELL_CFLAGS) spell/makedent.c -o objects/makedent.o
-+
++
+objects/tree.o: spell/tree.c spell/config.h spell/ispell.h spell/i_proto.h spell/msgs.h spell/local.h
+ $(CC) -c $(SPELL_CFLAGS) spell/tree.c -o objects/tree.o
-+
++
+objects/tgood.o: spell/tgood.c spell/config.h spell/ispell.h spell/i_proto.h spell/local.h
+ $(CC) -c $(SPELL_CFLAGS) spell/tgood.c -o objects/tgood.o
-+
++
+objects/util.o: spell/util.c spell/config.h spell/ispell.h spell/i_proto.h spell/local.h
+ $(CC) -c $(SPELL_CFLAGS) spell/util.c -o objects/util.o
-diff -burN -x '*.orig' vim-6.2.532.orig/src/normal.c vim-6.2.532/src/normal.c
---- vim-6.2.532.orig/src/normal.c 2004-05-08 08:55:11.000000000 +0200
-+++ vim-6.2.532/src/normal.c 2004-05-08 09:25:12.304949392 +0200
++
+diff -urBbN vim64.org/src/normal.c vim64/src/normal.c
+--- vim64.org/src/normal.c 2005-10-06 20:42:06.000000000 +0200
++++ vim64/src/normal.c 2005-10-17 12:49:17.471840624 +0200
@@ -84,6 +84,10 @@
#ifdef FEAT_VISUAL
static int get_visual_text __ARGS((cmdarg_T *cap, char_u **pp, int *lenp));
{Ctrl_T, nv_tagpop, NV_NCW, 0},
{Ctrl_U, nv_halfpage, 0, 0},
#ifdef FEAT_VISUAL
-@@ -7834,6 +7846,28 @@
+@@ -7845,6 +7857,28 @@
#endif
}
#ifdef FEAT_VISUAL
/*
* In exclusive Visual mode, may include the last character.
-diff -burN -x '*.orig' vim-6.2.532.orig/src/option.c vim-6.2.532/src/option.c
---- vim-6.2.532.orig/src/option.c 2004-05-08 08:55:13.000000000 +0200
-+++ vim-6.2.532/src/option.c 2004-05-08 09:43:59.312618184 +0200
+diff -urBbN vim64.org/src/option.c vim64/src/option.c
+--- vim64.org/src/option.c 2005-10-08 16:27:46.000000000 +0200
++++ vim64/src/option.c 2005-10-17 12:49:17.478839560 +0200
@@ -121,6 +121,8 @@
, PV_SW
, PV_SWF
static long p_ts;
static long p_tw;
static int p_tx;
-@@ -1072,7 +1078,7 @@
+@@ -1073,7 +1079,7 @@
{(char_u *)FALSE, (char_u *)0L}},
{"highlight", "hl", P_STRING|P_VI_DEF|P_RCLR|P_COMMA|P_NODUP,
(char_u *)&p_hl, PV_NONE,
(char_u *)0L}},
{"history", "hi", P_NUM|P_VIM,
(char_u *)&p_hi, PV_NONE,
-@@ -1337,6 +1343,13 @@
+@@ -1338,6 +1344,13 @@
(char_u *)NULL, PV_NONE,
#endif
{(char_u *)"", (char_u *)0L}},
{"laststatus", "ls", P_NUM|P_VI_DEF|P_RALL,
#ifdef FEAT_WINDOWS
(char_u *)&p_ls, PV_NONE,
-@@ -1935,6 +1948,14 @@
+@@ -1936,6 +1949,14 @@
{"sourceany", NULL, P_BOOL|P_VI_DEF,
(char_u *)NULL, PV_NONE,
{(char_u *)FALSE, (char_u *)0L}},
{"splitbelow", "sb", P_BOOL|P_VI_DEF,
#ifdef FEAT_WINDOWS
(char_u *)&p_sb, PV_NONE,
-@@ -4815,6 +4836,26 @@
+@@ -4835,6 +4856,26 @@
errmsg = e_invarg;
}
#endif
#ifdef FEAT_MBYTE
/* 'encoding' and 'fileencoding' */
-@@ -7921,6 +7962,10 @@
+@@ -7951,6 +7992,10 @@
#ifdef FEAT_SYN_HL
case PV_SYN: return (char_u *)&(curbuf->b_p_syn);
#endif
case PV_SW: return (char_u *)&(curbuf->b_p_sw);
case PV_TS: return (char_u *)&(curbuf->b_p_ts);
case PV_TW: return (char_u *)&(curbuf->b_p_tw);
-diff -burN -x '*.orig' vim-6.2.532.orig/src/option.h vim-6.2.532/src/option.h
---- vim-6.2.532.orig/src/option.h 2004-05-08 08:55:13.000000000 +0200
-+++ vim-6.2.532/src/option.h 2004-05-08 09:25:23.884189080 +0200
+diff -urBbN vim64.org/src/option.h vim64/src/option.h
+--- vim64.org/src/option.h 2004-05-05 11:43:49.000000000 +0200
++++ vim64/src/option.h 2005-10-17 12:49:17.494837128 +0200
@@ -385,6 +385,8 @@
EXTERN char_u *p_dex; /* 'diffexpr' */
# endif
#ifdef FEAT_INS_EXPAND
EXTERN char_u *p_dict; /* 'dictionary' */
#endif
-diff -burN -x '*.orig' vim-6.2.532.orig/src/proto/spell.pro vim-6.2.532/src/proto/spell.pro
---- vim-6.2.532.orig/src/proto/spell.pro 1970-01-01 01:00:00.000000000 +0100
-+++ vim-6.2.532/src/proto/spell.pro 2004-05-08 09:25:23.885188928 +0200
+diff -urBbN vim64.org/src/proto/spell.pro vim64/src/proto/spell.pro
+--- vim64.org/src/proto/spell.pro 1970-01-01 01:00:00.000000000 +0100
++++ vim64/src/proto/spell.pro 2005-10-17 12:49:17.495836976 +0200
@@ -0,0 +1,5 @@
+int reload_dict(void);\r
+void ex_spell(exarg_T *eap);\r
+int get_spell_attr(colnr_T spell_col, colnr_T col, char_u *line);\r
+int set_to_private_dict(char *line, int cursor_col, int convert_to_lower);\r
+void spell_save_private_dict(void);\r
-diff -burN -x '*.orig' vim-6.2.532.orig/src/proto.h vim-6.2.532/src/proto.h
---- vim-6.2.532.orig/src/proto.h 2004-05-08 08:55:13.000000000 +0200
-+++ vim-6.2.532/src/proto.h 2004-05-08 09:25:23.887188624 +0200
+diff -urBbN vim64.org/src/proto.h vim64/src/proto.h
+--- vim64.org/src/proto.h 2005-10-08 16:22:32.000000000 +0200
++++ vim64/src/proto.h 2005-10-17 12:49:17.496836824 +0200
@@ -72,6 +72,9 @@
# include "os_qnx.pro"
# endif
# include "buffer.pro"
# include "charset.pro"
# ifdef FEAT_CSCOPE
-diff -burN -x '*.orig' vim-6.2.532.orig/src/screen.c vim-6.2.532/src/screen.c
---- vim-6.2.532.orig/src/screen.c 2004-05-08 08:55:12.000000000 +0200
-+++ vim-6.2.532/src/screen.c 2004-05-08 09:25:23.901186496 +0200
+diff -urBbN vim64.org/src/screen.c vim64/src/screen.c
+--- vim64.org/src/screen.c 2005-01-19 11:03:00.000000000 +0100
++++ vim64/src/screen.c 2005-10-17 12:49:17.501836064 +0200
@@ -118,6 +118,9 @@
static match_T match_hl; /* used for ":match" highlight matching */
#endif
#ifdef FEAT_FOLDING
static foldinfo_T win_foldinfo; /* info for 'foldcolumn' */
#endif
-@@ -2537,6 +2540,9 @@
+@@ -2536,6 +2539,9 @@
int has_syntax = FALSE; /* this buffer has syntax highl. */
int save_did_emsg;
#endif
int extra_check; /* has syntax or linebreak */
#ifdef FEAT_MBYTE
int multi_attr = 0; /* attributes desired by multibyte */
-@@ -2615,8 +2621,18 @@
+@@ -2614,8 +2620,18 @@
#else
extra_check = 0;
#endif
{
/* Prepare for syntax highlighting in this line. When there is an
* error, stop syntax highlighting. */
-@@ -3263,6 +3279,10 @@
+@@ -3262,6 +3278,10 @@
else if (search_attr == 0 && has_syntax)
char_attr = syntax_attr;
#endif
else
char_attr = search_attr;
-@@ -3577,6 +3597,17 @@
+@@ -3576,6 +3596,17 @@
char_attr = syntax_attr;
}
#endif
#ifdef FEAT_LINEBREAK
/*
* Found last space before word: check for line break
-diff -burN -x '*.orig' vim-6.2.532.orig/src/spell/config.h vim-6.2.532/src/spell/config.h
---- vim-6.2.532.orig/src/spell/config.h 1970-01-01 01:00:00.000000000 +0100
-+++ vim-6.2.532/src/spell/config.h 2004-05-08 09:25:23.929182240 +0200
+diff -urBbN vim64.org/src/spell/config.h vim64/src/spell/config.h
+--- vim64.org/src/spell/config.h 1970-01-01 01:00:00.000000000 +0100
++++ vim64/src/spell/config.h 2005-10-17 12:49:17.504835608 +0200
@@ -0,0 +1,846 @@
+#include "local.h" /* local definitions for options */
+
+#endif /* COUNTSUFFIX */
+#define SIGNAL_TYPE_STRING "void"
+#define MASKTYPE_STRING "long"
-diff -burN -x '*.orig' vim-6.2.532.orig/src/spell/good.c vim-6.2.532/src/spell/good.c
---- vim-6.2.532.orig/src/spell/good.c 1970-01-01 01:00:00.000000000 +0100
-+++ vim-6.2.532/src/spell/good.c 2004-05-08 09:25:23.933181632 +0200
+diff -urBbN vim64.org/src/spell/good.c vim64/src/spell/good.c
+--- vim64.org/src/spell/good.c 1970-01-01 01:00:00.000000000 +0100
++++ vim64/src/spell/good.c 2005-10-17 12:49:17.505835456 +0200
@@ -0,0 +1,400 @@
+#ifndef lint
+static char Rcs_Id[] =
+ if (sufflag > 0)
+ (void) putchar (sufflag);
+}
-diff -burN -x '*.orig' vim-6.2.532.orig/src/spell/hash.c vim-6.2.532/src/spell/hash.c
---- vim-6.2.532.orig/src/spell/hash.c 1970-01-01 01:00:00.000000000 +0100
-+++ vim-6.2.532/src/spell/hash.c 2004-05-08 09:25:23.934181480 +0200
+diff -urBbN vim64.org/src/spell/hash.c vim64/src/spell/hash.c
+--- vim64.org/src/spell/hash.c 1970-01-01 01:00:00.000000000 +0100
++++ vim64/src/spell/hash.c 2005-10-17 12:49:17.506835304 +0200
@@ -0,0 +1,91 @@
+/*
+ * hash.c - a simple hash function for ispell
+ }
+ return (unsigned long) h % hashtblsize;
+}
-diff -burN -x '*.orig' vim-6.2.532.orig/src/spell/i_proto.h vim-6.2.532/src/spell/i_proto.h
---- vim-6.2.532.orig/src/spell/i_proto.h 1970-01-01 01:00:00.000000000 +0100
-+++ vim-6.2.532/src/spell/i_proto.h 2004-05-08 09:25:23.936181176 +0200
+diff -urBbN vim64.org/src/spell/i_proto.h vim64/src/spell/i_proto.h
+--- vim64.org/src/spell/i_proto.h 1970-01-01 01:00:00.000000000 +0100
++++ vim64/src/spell/i_proto.h 2005-10-17 12:49:17.507835152 +0200
@@ -0,0 +1,112 @@
+Global int addvheader (struct dent * ent);
+Global void askmode (void);
+Global int insert(register ichar_t * word);
+Global char * linit (char *);
+Global char * last_slash (char *file);
-diff -burN -x '*.orig' vim-6.2.532.orig/src/spell/ispell.h vim-6.2.532/src/spell/ispell.h
---- vim-6.2.532.orig/src/spell/ispell.h 1970-01-01 01:00:00.000000000 +0100
-+++ vim-6.2.532/src/spell/ispell.h 2004-05-08 09:25:23.940180568 +0200
+diff -urBbN vim64.org/src/spell/ispell.h vim64/src/spell/ispell.h
+--- vim64.org/src/spell/ispell.h 1970-01-01 01:00:00.000000000 +0100
++++ vim64/src/spell/ispell.h 2005-10-17 12:49:17.509834848 +0200
@@ -0,0 +1,611 @@
+/*
+ * $Id$
+S_INIT (char LaTeX_Mode, 'P');
+
+#include "i_proto.h"
-diff -burN -x '*.orig' vim-6.2.532.orig/src/spell/local.h vim-6.2.532/src/spell/local.h
---- vim-6.2.532.orig/src/spell/local.h 1970-01-01 01:00:00.000000000 +0100
-+++ vim-6.2.532/src/spell/local.h 2004-05-08 09:25:23.942180264 +0200
+diff -urBbN vim64.org/src/spell/local.h vim64/src/spell/local.h
+--- vim64.org/src/spell/local.h 1970-01-01 01:00:00.000000000 +0100
++++ vim64/src/spell/local.h 2005-10-17 12:49:17.510834696 +0200
@@ -0,0 +1,338 @@
+/*
+ * Written by Eli Zaretskii <eliz@is.elta.co.il>
+#define HASHSUFFIX ".hash"
+#define STATSUFFIX ".sta"
+#define COUNTSUFFIX ".cnt"
-diff -burN -x '*.orig' vim-6.2.532.orig/src/spell/lookup.c vim-6.2.532/src/spell/lookup.c
---- vim-6.2.532.orig/src/spell/lookup.c 1970-01-01 01:00:00.000000000 +0100
-+++ vim-6.2.532/src/spell/lookup.c 2004-05-08 09:25:23.945179808 +0200
+diff -urBbN vim64.org/src/spell/lookup.c vim64/src/spell/lookup.c
+--- vim64.org/src/spell/lookup.c 1970-01-01 01:00:00.000000000 +0100
++++ vim64/src/spell/lookup.c 2005-10-17 12:49:17.511834544 +0200
@@ -0,0 +1,534 @@
+#ifndef lint
+static char Rcs_Id[] =
+ else
+ return NULL;
+}
-diff -burN -x '*.orig' vim-6.2.532.orig/src/spell/makedent.c vim-6.2.532/src/spell/makedent.c
---- vim-6.2.532.orig/src/spell/makedent.c 1970-01-01 01:00:00.000000000 +0100
-+++ vim-6.2.532/src/spell/makedent.c 2004-05-08 09:25:23.953178592 +0200
+diff -urBbN vim64.org/src/spell/makedent.c vim64/src/spell/makedent.c
+--- vim64.org/src/spell/makedent.c 1970-01-01 01:00:00.000000000 +0100
++++ vim64/src/spell/makedent.c 2005-10-17 12:49:17.514834088 +0200
@@ -0,0 +1,1107 @@
+/*
+ * Copyright 1988, 1989, 1992, 1993, Geoff Kuenning, Granada Hills, CA
+ }
+ return(NULL);
+}
-diff -burN -x '*.orig' vim-6.2.532.orig/src/spell/msgs.h vim-6.2.532/src/spell/msgs.h
---- vim-6.2.532.orig/src/spell/msgs.h 1970-01-01 01:00:00.000000000 +0100
-+++ vim-6.2.532/src/spell/msgs.h 2004-05-08 09:25:23.956178136 +0200
+diff -urBbN vim64.org/src/spell/msgs.h vim64/src/spell/msgs.h
+--- vim64.org/src/spell/msgs.h 1970-01-01 01:00:00.000000000 +0100
++++ vim64/src/spell/msgs.h 2005-10-17 12:49:17.515833936 +0200
@@ -0,0 +1,278 @@
+/*
+ * $Id$
+ */
+#define UNSQ_C_BAD_COUNT "Illegal count character 0x%x\n"
+#define UNSQ_C_SURPRISE_EOF "Unexpected EOF\n"
-diff -burN -x '*.orig' vim-6.2.532.orig/src/spell/tgood.c vim-6.2.532/src/spell/tgood.c
---- vim-6.2.532.orig/src/spell/tgood.c 1970-01-01 01:00:00.000000000 +0100
-+++ vim-6.2.532/src/spell/tgood.c 2004-05-08 09:25:23.960177528 +0200
+diff -urBbN vim64.org/src/spell/tgood.c vim64/src/spell/tgood.c
+--- vim64.org/src/spell/tgood.c 1970-01-01 01:00:00.000000000 +0100
++++ vim64/src/spell/tgood.c 2005-10-17 12:49:17.517833632 +0200
@@ -0,0 +1,654 @@
+/*
+ * Copyright 1987, 1988, 1989, 1992, 1993, Geoff Kuenning, Granada Hills, CA
+ for ( ; --len >= 0; dst++)
+ *dst = mytolower (*dst);
+ }
-diff -burN -x '*.orig' vim-6.2.532.orig/src/spell/tree.c vim-6.2.532/src/spell/tree.c
---- vim-6.2.532.orig/src/spell/tree.c 1970-01-01 01:00:00.000000000 +0100
-+++ vim-6.2.532/src/spell/tree.c 2004-05-08 09:25:23.964176920 +0200
+diff -urBbN vim64.org/src/spell/tree.c vim64/src/spell/tree.c
+--- vim64.org/src/spell/tree.c 1970-01-01 01:00:00.000000000 +0100
++++ vim64/src/spell/tree.c 2005-10-17 12:49:17.518833480 +0200
@@ -0,0 +1,748 @@
+/*
+ * tree.c - a hash style dictionary for user's personal words
+ return NULL;
+}
+#endif /* REGEX_LOOKUP */
-diff -burN -x '*.orig' vim-6.2.532.orig/src/spell/util.c vim-6.2.532/src/spell/util.c
---- vim-6.2.532.orig/src/spell/util.c 1970-01-01 01:00:00.000000000 +0100
-+++ vim-6.2.532/src/spell/util.c 2004-05-08 09:25:23.966176616 +0200
+diff -urBbN vim64.org/src/spell/util.c vim64/src/spell/util.c
+--- vim64.org/src/spell/util.c 1970-01-01 01:00:00.000000000 +0100
++++ vim64/src/spell/util.c 2005-10-17 12:49:17.520833176 +0200
@@ -0,0 +1,351 @@
+#include <ctype.h>
+#include "ispell.h"
+ }
+ return(NULL);
+}
-diff -burN -x '*.orig' vim-6.2.532.orig/src/spell/version.h vim-6.2.532/src/spell/version.h
---- vim-6.2.532.orig/src/spell/version.h 1970-01-01 01:00:00.000000000 +0100
-+++ vim-6.2.532/src/spell/version.h 2004-05-08 09:25:23.968176312 +0200
+diff -urBbN vim64.org/src/spell/version.h vim64/src/spell/version.h
+--- vim64.org/src/spell/version.h 1970-01-01 01:00:00.000000000 +0100
++++ vim64/src/spell/version.h 2005-10-17 12:49:17.521833024 +0200
@@ -0,0 +1,124 @@
+/*
+ * Since the strings in this file are printed out when the "-v" switch is
+ * Get rid of all old RCS log lines in preparation for the 3.1 release.
+ *
+ */
-diff -burN -x '*.orig' vim-6.2.532.orig/src/spell/wm.h vim-6.2.532/src/spell/wm.h
---- vim-6.2.532.orig/src/spell/wm.h 1970-01-01 01:00:00.000000000 +0100
-+++ vim-6.2.532/src/spell/wm.h 2004-05-08 09:25:23.969176160 +0200
+diff -urBbN vim64.org/src/spell/wm.h vim64/src/spell/wm.h
+--- vim64.org/src/spell/wm.h 1970-01-01 01:00:00.000000000 +0100
++++ vim64/src/spell/wm.h 2005-10-17 12:49:17.521833024 +0200
@@ -0,0 +1,12 @@
+#ifndef Public
+enum _logical {False,True};
+#define Public
+#define Local static
+#endif
-diff -burN -x '*.orig' vim-6.2.532.orig/src/spell.c vim-6.2.532/src/spell.c
---- vim-6.2.532.orig/src/spell.c 1970-01-01 01:00:00.000000000 +0100
-+++ vim-6.2.532/src/spell.c 2004-05-08 09:25:23.970176008 +0200
+diff -urBbN vim64.org/src/spell.c vim64/src/spell.c
+--- vim64.org/src/spell.c 1970-01-01 01:00:00.000000000 +0100
++++ vim64/src/spell.c 2005-10-17 12:49:17.522832872 +0200
@@ -0,0 +1,183 @@
+#include "spell/wm.h"
+#include "vim.h"
+ treeoutput ();
+}
+#endif
-diff -burN -x '*.orig' vim-6.2.532.orig/src/syntax.c vim-6.2.532/src/syntax.c
---- vim-6.2.532.orig/src/syntax.c 2004-05-08 08:55:12.000000000 +0200
-+++ vim-6.2.532/src/syntax.c 2004-05-08 09:25:23.987173424 +0200
-@@ -5922,6 +5922,9 @@
+diff -urBbN vim64.org/src/syntax.c vim64/src/syntax.c
+--- vim64.org/src/syntax.c 2005-07-24 19:39:04.000000000 +0200
++++ vim64/src/syntax.c 2005-10-17 12:49:17.527832112 +0200
+@@ -5935,6 +5935,9 @@
"VertSplit term=reverse cterm=reverse gui=reverse",
"Visual term=reverse cterm=reverse gui=reverse guifg=Grey guibg=fg",
"VisualNOS term=underline,bold cterm=underline,bold gui=underline,bold",
"DiffText term=reverse cterm=bold ctermbg=Red gui=bold guibg=Red",
NULL
};
-@@ -5942,6 +5945,9 @@
+@@ -5955,6 +5958,9 @@
"FoldColumn term=standout ctermbg=Grey ctermfg=DarkBlue guibg=Grey guifg=DarkBlue",
"SignColumn term=standout ctermbg=Grey ctermfg=DarkBlue guibg=Grey guifg=DarkBlue",
"DiffAdd term=bold ctermbg=LightBlue guibg=LightBlue",
"DiffChange term=bold ctermbg=LightMagenta guibg=LightMagenta",
"DiffDelete term=bold ctermfg=Blue ctermbg=LightCyan gui=bold guifg=Blue guibg=LightCyan",
NULL
-@@ -5963,6 +5969,9 @@
+@@ -5976,6 +5982,9 @@
"FoldColumn term=standout ctermbg=DarkGrey ctermfg=Cyan guibg=Grey guifg=Cyan",
"SignColumn term=standout ctermbg=DarkGrey ctermfg=Cyan guibg=Grey guifg=Cyan",
"DiffAdd term=bold ctermbg=DarkBlue guibg=DarkBlue",
"DiffChange term=bold ctermbg=DarkMagenta guibg=DarkMagenta",
"DiffDelete term=bold ctermfg=Blue ctermbg=DarkCyan gui=bold guifg=Blue guibg=DarkCyan",
NULL
-diff -burN -x '*.orig' vim-6.2.532.orig/src/version.c vim-6.2.532/src/version.c
---- vim-6.2.532.orig/src/version.c 2004-05-08 08:55:13.000000000 +0200
-+++ vim-6.2.532/src/version.c 2004-05-08 09:25:23.992172664 +0200
+diff -urBbN vim64.org/src/version.c vim64/src/version.c
+--- vim64.org/src/version.c 2005-10-17 12:43:54.788895000 +0200
++++ vim64/src/version.c 2005-10-17 12:49:17.529831808 +0200
@@ -474,6 +474,11 @@
#else
"-syntax",
/* only interesting on Unix systems */
#if defined(USE_SYSTEM) && (defined(UNIX) || defined(__EMX__))
"+system()",
-@@ -2201,7 +2206,7 @@
+@@ -1135,7 +1140,7 @@
int add_version;
int attr;
{
int col;
char_u *p;
int l;
-diff -burN -x '*.orig' vim-6.2.532.orig/src/version.h vim-6.2.532/src/version.h
---- vim-6.2.532.orig/src/version.h 2004-05-08 08:55:13.000000000 +0200
-+++ vim-6.2.532/src/version.h 2004-05-08 09:25:23.993172512 +0200
+diff -urBbN vim64.org/src/version.h vim64/src/version.h
+--- vim64.org/src/version.h 2005-10-15 13:21:16.000000000 +0200
++++ vim64/src/version.h 2005-10-17 12:50:20.563249272 +0200
@@ -35,6 +35,10 @@
*/
- #define VIM_VERSION_NODOT "vim63"
- #define VIM_VERSION_SHORT "6.3"
+ #define VIM_VERSION_NODOT "vim64"
+ #define VIM_VERSION_SHORT "6.4"
+#ifdef FEAT_SPELL_HL
-+#define VIM_VERSION_MEDIUM "6.3 + ispell 3.1.20 WM-3"
++#define VIM_VERSION_MEDIUM "6.4 + ispell 3.1.20 WM-3"
+#else
- #define VIM_VERSION_MEDIUM "6.3"
-+#endif
- #define VIM_VERSION_LONG "VIM - Vi IMproved 6.3 (2004 June 7)"
- #define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 6.3 (2004 June 7, compiled "
-diff -burN -x '*.orig' vim-6.2.532.orig/src/vim.h vim-6.2.532/src/vim.h
---- vim-6.2.532.orig/src/vim.h 2004-05-08 08:55:11.000000000 +0200
-+++ vim-6.2.532/src/vim.h 2004-05-08 09:27:06.192635832 +0200
-@@ -1084,13 +1084,14 @@
+ #define VIM_VERSION_MEDIUM "6.4"
++#endif
+ #define VIM_VERSION_LONG "VIM - Vi IMproved 6.4 (2005 Oct 15)"
+ #define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 6.4 (2005 Oct 15, compiled "
+diff -urBbN vim64.org/src/vim.h vim64/src/vim.h
+--- vim64.org/src/vim.h 2005-10-08 16:22:05.000000000 +0200
++++ vim64/src/vim.h 2005-10-17 12:49:17.532831352 +0200
+@@ -1076,13 +1076,14 @@
, HLF_DED /* Deleted diff line */
, HLF_TXD /* Text Changed in diff line */
, HLF_SC /* Sign column */