-diff -Nur vim60am.old/src/Makefile vim60am/src/Makefile
---- vim60am.old/src/Makefile Wed Jul 4 20:42:09 2001
-+++ vim60am/src/Makefile Tue Jul 3 18:55:58 2001
-@@ -1077,6 +1077,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)
-
-+SPELL_SRC = spell.c \
-+ spell/good.c \
-+ spell/lookup.c \
-+ spell/hash.c \
-+ spell/makedent.c \
-+ spell/tree.c \
-+ spell/tgood.c \
-+ spell/util.c
-+SPELL_OBJ = objects/spell.o \
-+ objects/good.o \
-+ objects/lookup.o \
-+ objects/hash.o \
-+ objects/makedent.o \
-+ objects/tree.o \
-+ objects/tgood.o \
-+ objects/util.o
-
- ################################################
- ## no changes required below this line ##
-@@ -1087,7 +1103,7 @@
- .SUFFIXES:
- .SUFFIXES: .cc .c .o .pro
-
--PRE_DEFS = -Iproto $(DEFS) $(GUI_DEFS) $(GUI_IPATH) $(CPPFLAGS) $(EXTRA_IPATHS)
-+PRE_DEFS = -Iproto -Ispell $(DEFS) $(GUI_DEFS) $(GUI_IPATH) $(CPPFLAGS) $(EXTRA_IPATHS)
- POST_DEFS = $(X_CFLAGS) $(PERL_CFLAGS) $(PYTHON_CFLAGS) $(TCL_CFLAGS) $(RUBY_CFLAGS) $(EXTRA_DEFS)
-
- ALL_CFLAGS = $(PRE_DEFS) $(CFLAGS) $(POST_DEFS)
-@@ -1167,6 +1183,7 @@
- screen.c \
- search.c \
- syntax.c \
-+ $(SPELL_SRC) \
- tag.c \
- term.c \
- ui.c \
-@@ -1232,6 +1249,7 @@
- objects/screen.o \
- objects/search.o \
- objects/syntax.o \
-+ $(SPELL_OBJ) \
- $(SNIFF_OBJ) \
- objects/tag.o \
- objects/term.o \
-@@ -2094,6 +2112,9 @@
- objects/undo.o: undo.c
- $(CCC) -o $@ undo.c
-
-+objects/spell.o: spell.c spell/local.h
-+ $(CCC) -o $@ spell.c
-+
- objects/window.o: window.c
- $(CCC) -o $@ window.c
-
-@@ -2212,6 +2233,9 @@
- objects/search.o: search.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 option.h ex_cmds.h proto.h globals.h farsi.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 option.h ex_cmds.h proto.h globals.h farsi.h
-@@ -2334,3 +2358,26 @@
- objects/integration.o: integration.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 option.h ex_cmds.h proto.h globals.h farsi.h integration.h
-+
-+SPELL_CFLAGS=$(CFLAGS) -pedantic -DUSG=1
-+
-+objects/good.o: spell/good.c spell/config.h spell/ispell.h spell/i_proto.h spell/msgs.h spell/local.h
-+ $(CC) -c $(SPELL_CFLAGS) spell/good.c -o objects/good.o
-+
-+objects/lookup.o: spell/lookup.c spell/config.h spell/ispell.h spell/i_proto.h spell/msgs.h spell/local.h
-+ $(CC) -c $(SPELL_CFLAGS) spell/lookup.c -o objects/lookup.o
-+
-+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 -Nur vim60am.old/src/edit.c vim60am/src/edit.c
---- vim60am.old/src/edit.c Wed Jul 4 20:42:09 2001
-+++ vim60am/src/edit.c Tue Jul 3 18:50:12 2001
-@@ -613,7 +613,11 @@
- if (c == Ctrl_V && ctrl_x_mode == CTRL_X_CMDLINE)
+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
+@@ -659,7 +659,11 @@
+ if ((c == Ctrl_V || c == Ctrl_Q) && ctrl_x_mode == CTRL_X_CMDLINE)
goto docomplete;
#endif
- if (c == Ctrl_V || c == Ctrl_Q)
{
ins_ctrl_v();
c = Ctrl_V; /* pretend CTRL-V is last typed character */
-@@ -1133,6 +1137,20 @@
+@@ -1229,6 +1233,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 -Nur vim60am.old/src/ex_cmds.h vim60am/src/ex_cmds.h
---- vim60am.old/src/ex_cmds.h Wed Jul 4 20:42:09 2001
-+++ vim60am/src/ex_cmds.h Tue Jul 3 18:49:12 2001
-@@ -700,6 +700,8 @@
- RANGE|WHOLEFOLD|EXTRA|CMDWIN|MODIFY),
- EX(CMD_source, "source", ex_source,
+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 @@
+ #ifdef FEAT_SNIFF
+ "sniff",
+ #endif
++#ifdef FEAT_SPELL_HL
++ "spell",
++#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
+@@ -726,6 +726,8 @@
BANG|FILE1|TRLBAR|SBOXOK|CMDWIN),
-+EX(CMD_spell, "spell", ex_spell,
-+ EXTRA|NOTRLCOM|CMDWIN),
EX(CMD_split, "split", ex_splitview,
BANG|FILE1|RANGE|NOTADR|EDITCMD|ARGOPT|TRLBAR),
++EX(CMD_spell, "spell", ex_spell,
++ EXTRA|NOTRLCOM|CMDWIN),
EX(CMD_sprevious, "sprevious", ex_previous,
-diff -Nur vim60am.old/src/ex_docmd.c vim60am/src/ex_docmd.c
---- vim60am.old/src/ex_docmd.c Wed Jul 4 20:42:09 2001
-+++ vim60am/src/ex_docmd.c Tue Jul 3 18:47:38 2001
-@@ -218,6 +218,9 @@
+ 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
+@@ -220,6 +220,9 @@
#ifndef FEAT_SYN_HL
# define ex_syntax ex_ni
#endif
+# define ex_spell ex_ni
+#endif
#ifndef FEAT_PERL
- # define ex_perl ex_ni
+ # define ex_perl ex_script_ni
# define ex_perldo ex_ni
-@@ -2546,6 +2549,12 @@
+@@ -3404,6 +3407,12 @@
set_context_in_syntax_cmd(xp, arg);
break;
#endif
#ifdef FEAT_EVAL
case CMD_let:
case CMD_if:
-diff -Nur vim60am.old/src/feature.h vim60am/src/feature.h
---- vim60am.old/src/feature.h Wed Jul 4 20:42:09 2001
-+++ vim60am/src/feature.h Tue Jul 3 18:46:14 2001
-@@ -315,6 +315,12 @@
+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
+@@ -314,6 +314,11 @@
+ # define FEAT_RIGHTLEFT
# endif
- # define FEAT_FKMAP
#endif
+#ifdef FEAT_BIG
+#undef FEAT_RIGHTLEFT
+#undef FEAT_FKMAP
-+#define FEAT_SPELL_HL /*WM*/
+#endif
+/* # define FEAT_PRINTER */
/*
- * +emacs_tags When FEAT_EMACS_TAGS defined: Include support for
-diff -Nur vim60am.old/src/globals.h vim60am/src/globals.h
---- vim60am.old/src/globals.h Wed Jul 4 20:42:09 2001
-+++ vim60am/src/globals.h Tue Jul 3 18:45:54 2001
-@@ -718,6 +718,9 @@
+ * +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 @@
#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 -Nur vim60am.old/src/main.c vim60am/src/main.c
---- vim60am.old/src/main.c Wed Jul 4 20:42:09 2001
-+++ vim60am/src/main.c Tue Jul 3 18:45:08 2001
-@@ -1901,6 +1901,9 @@
- }
- }
- #endif /* FEAT_VIMINFO */
+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 @@
+ write_viminfo(NULL, FALSE);
+ #endif
+
+#ifdef FEAT_SPELL_HL
+ spell_save_private_dict();
+#endif
-
++
#ifdef FEAT_AUTOCMD
apply_autocmds(EVENT_VIMLEAVE, NULL, NULL, FALSE, curbuf);
-diff -Nur vim60am.old/src/normal.c vim60am/src/normal.c
---- vim60am.old/src/normal.c Wed Jul 4 20:42:09 2001
-+++ vim60am/src/normal.c Tue Jul 3 18:44:28 2001
-@@ -85,6 +85,10 @@
+ #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 @@
+ # Use this for cproto 3 patchlevel 7 or above (use "cproto -V" to check):
+ PROTO_FLAGS = -m -M__ARGS -d -E"$(CPP)" $(NO_ATTR)
+
++SPELL_SRC = spell.c \
++ spell/good.c \
++ spell/lookup.c \
++ spell/hash.c \
++ spell/makedent.c \
++ spell/tree.c \
++ spell/tgood.c \
++ spell/util.c
++SPELL_OBJ = objects/spell.o \
++ objects/good.o \
++ objects/lookup.o \
++ objects/hash.o \
++ objects/makedent.o \
++ objects/tree.o \
++ objects/tgood.o \
++ objects/util.o
+
+ ################################################
+ ## no changes required below this line ##
+@@ -1244,7 +1260,7 @@
+ .SUFFIXES:
+ .SUFFIXES: .cc .c .o .pro
+
+-PRE_DEFS = -Iproto $(DEFS) $(GUI_DEFS) $(GUI_IPATH) $(CPPFLAGS) $(EXTRA_IPATHS)
++PRE_DEFS = -Iproto -Ispell $(DEFS) $(GUI_DEFS) $(GUI_IPATH) $(CPPFLAGS) $(EXTRA_IPATHS)
+ 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 @@
+ screen.c \
+ search.c \
+ syntax.c \
++ $(SPELL_SRC) \
+ tag.c \
+ term.c \
+ ui.c \
+@@ -1392,6 +1409,7 @@
+ objects/screen.o \
+ objects/search.o \
+ objects/syntax.o \
++ $(SPELL_OBJ) \
+ $(SNIFF_OBJ) \
+ objects/tag.o \
+ objects/term.o \
+@@ -2392,6 +2410,9 @@
+ objects/undo.o: undo.c
+ $(CCC) -o $@ undo.c
+
++objects/spell.o: spell.c spell/local.h
++ $(CCC) -o $@ spell.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
++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
++
++SPELL_CFLAGS=$(CFLAGS) -pedantic -DUSG=1
++
++objects/good.o: spell/good.c spell/config.h spell/ispell.h spell/i_proto.h spell/msgs.h spell/local.h
++ $(CC) -c $(SPELL_CFLAGS) spell/good.c -o objects/good.o
++
++objects/lookup.o: spell/lookup.c spell/config.h spell/ispell.h spell/i_proto.h spell/msgs.h spell/local.h
++ $(CC) -c $(SPELL_CFLAGS) spell/lookup.c -o objects/lookup.o
++
++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
+@@ -84,6 +84,10 @@
#ifdef FEAT_VISUAL
static int get_visual_text __ARGS((cmdarg_T *cap, char_u **pp, int *lenp));
#endif
+#endif
static void nv_tagpop __ARGS((cmdarg_T *cap));
static void nv_scroll __ARGS((cmdarg_T *cap));
- static void nv_kright __ARGS((cmdarg_T *cap));
-@@ -226,9 +230,17 @@
+ static void nv_right __ARGS((cmdarg_T *cap));
+@@ -232,9 +236,17 @@
{Ctrl_N, nv_down, NV_STS, FALSE},
{Ctrl_O, nv_ctrlo, 0, 0},
{Ctrl_P, nv_up, NV_STS, FALSE},
{Ctrl_T, nv_tagpop, NV_NCW, 0},
{Ctrl_U, nv_halfpage, 0, 0},
#ifdef FEAT_VISUAL
-@@ -7316,6 +7328,28 @@
+@@ -7834,6 +7846,28 @@
#endif
}
#ifdef FEAT_VISUAL
/*
* In exclusive Visual mode, may include the last character.
-diff -Nur vim60am.old/src/option.c vim60am/src/option.c
---- vim60am.old/src/option.c Wed Jul 4 20:42:09 2001
-+++ vim60am/src/option.c Tue Jul 3 18:42:14 2001
-@@ -116,6 +116,8 @@
+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
+@@ -121,6 +121,8 @@
, PV_SW
, PV_SWF
, PV_SYN
, PV_TAGS
, PV_TS
, PV_TSR
-@@ -216,6 +218,10 @@
+@@ -221,6 +223,10 @@
#ifdef FEAT_SYN_HL
static char_u *p_syn;
#endif
static long p_ts;
static long p_tw;
static int p_tx;
-@@ -1001,7 +1007,7 @@
+@@ -1072,7 +1078,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 *)"8:SpecialKey,@:NonText,d:Directory,e:ErrorMsg,i:IncSearch,l:Search,m:MoreMsg,M:ModeMsg,n:LineNr,r:Question,s:StatusLine,S:StatusLineNC,c:VertSplit,t:Title,v:Visual,V:VisualNOS,w:WarningMsg,W:WildMenu,f:Folded,F:FoldColumn,A:DiffAdd,C:DiffChange,D:DiffDelete,T:DiffText",
-+ {(char_u *)"8:SpecialKey,@:NonText,d:Directory,e:ErrorMsg,i:IncSearch,l:Search,m:MoreMsg,M:ModeMsg,n:LineNr,r:Question,s:StatusLine,S:StatusLineNC,c:VertSplit,t:Title,v:Visual,V:VisualNOS,w:WarningMsg,W:WildMenu,f:Folded,F:FoldColumn,A:DiffAdd,C:DiffChange,D:DiffDelete,T:DiffText,Z:Spell",
+- {(char_u *)"8:SpecialKey,@:NonText,d:Directory,e:ErrorMsg,i:IncSearch,l:Search,m:MoreMsg,M:ModeMsg,n:LineNr,r:Question,s:StatusLine,S:StatusLineNC,c:VertSplit,t:Title,v:Visual,V:VisualNOS,w:WarningMsg,W:WildMenu,f:Folded,F:FoldColumn,A:DiffAdd,C:DiffChange,D:DiffDelete,T:DiffText,>:SignColumn",
++ {(char_u *)"8:SpecialKey,@:NonText,d:Directory,e:ErrorMsg,i:IncSearch,l:Search,m:MoreMsg,M:ModeMsg,n:LineNr,r:Question,s:StatusLine,S:StatusLineNC,c:VertSplit,t:Title,v:Visual,V:VisualNOS,w:WarningMsg,W:WildMenu,f:Folded,F:FoldColumn,A:DiffAdd,C:DiffChange,D:DiffDelete,T:DiffText,>:SignColumn,Z:Spell",
(char_u *)0L}},
{"history", "hi", P_NUM|P_VIM,
(char_u *)&p_hi, PV_NONE,
-@@ -1247,6 +1253,13 @@
+@@ -1337,6 +1343,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,
-@@ -1815,6 +1828,14 @@
+@@ -1935,6 +1948,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,
-@@ -4337,6 +4357,26 @@
+@@ -4815,6 +4836,26 @@
errmsg = e_invarg;
}
#endif
#ifdef FEAT_MBYTE
/* 'encoding' and 'fileencoding' */
-@@ -6998,6 +7038,10 @@
- case PV_SWF: return (char_u *)&(curbuf->b_p_swf);
+@@ -7921,6 +7962,10 @@
#ifdef FEAT_SYN_HL
case PV_SYN: return (char_u *)&(curbuf->b_p_syn);
-+#endif
+ #endif
+#ifdef FEAT_SPELL_HL
+ case PV_SPELL_DIR: return (char_u *)&(p_spell_dir);
+ case PV_SPELL_LANG: return (char_u *)&(p_spell_lang);
- #endif
++#endif
case PV_SW: return (char_u *)&(curbuf->b_p_sw);
case PV_TS: return (char_u *)&(curbuf->b_p_ts);
-diff -Nur vim60am.old/src/option.h vim60am/src/option.h
---- vim60am.old/src/option.h Wed Jul 4 20:42:09 2001
-+++ vim60am/src/option.h Tue Jul 3 18:40:28 2001
-@@ -336,6 +336,8 @@
+ 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
+@@ -385,6 +385,8 @@
EXTERN char_u *p_dex; /* 'diffexpr' */
# endif
#endif
#ifdef FEAT_INS_EXPAND
EXTERN char_u *p_dict; /* 'dictionary' */
#endif
-diff -Nur vim60am.old/src/proto/spell.pro vim60am/src/proto/spell.pro
---- vim60am.old/src/proto/spell.pro Thu Jan 1 01:00:00 1970
-+++ vim60am/src/proto/spell.pro Wed Jun 27 19:19:35 2001
+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
@@ -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 -Nur vim60am.old/src/proto.h vim60am/src/proto.h
---- vim60am.old/src/proto.h Wed Jul 4 20:42:09 2001
-+++ vim60am/src/proto.h Tue Jul 3 18:38:16 2001
-@@ -64,6 +64,9 @@
+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
+@@ -72,6 +72,9 @@
# include "os_qnx.pro"
# endif
+#endif
# include "buffer.pro"
# include "charset.pro"
- # ifdef UNIX
-diff -Nur vim60am.old/src/screen.c vim60am/src/screen.c
---- vim60am.old/src/screen.c Wed Jul 4 20:42:09 2001
-+++ vim60am/src/screen.c Tue Jul 3 18:37:48 2001
-@@ -115,6 +115,9 @@
+ # 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
+@@ -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
-@@ -2333,6 +2336,9 @@
- int syntax_attr = 0; /* attributes desired by syntax */
+@@ -2537,6 +2540,9 @@
int has_syntax = FALSE; /* this buffer has syntax highl. */
+ int save_did_emsg;
#endif
+#ifdef FEAT_SPELL_HL
+ int spell_attr = 0;
int extra_check; /* has syntax or linebreak */
#ifdef FEAT_MBYTE
int multi_attr = 0; /* attributes desired by multibyte */
-@@ -2406,8 +2412,18 @@
+@@ -2615,8 +2621,18 @@
#else
extra_check = 0;
#endif
+#endif
+ )
{
- syntax_start(wp, lnum);
- has_syntax = TRUE;
-@@ -3004,6 +3020,10 @@
+ /* Prepare for syntax highlighting in this line. When there is an
+ * error, stop syntax highlighting. */
+@@ -3263,6 +3279,10 @@
else if (search_attr == 0 && has_syntax)
char_attr = syntax_attr;
#endif
else
char_attr = search_attr;
-@@ -3238,6 +3258,15 @@
-
- if (area_attr == 0 && search_attr == 0)
+@@ -3577,6 +3597,17 @@
char_attr = syntax_attr;
-+ }
-+#endif
+ }
+ #endif
+#ifdef FEAT_SPELL_HL
-+ if (spell_flag)
++ if (spell_flag)
+ {
+ v = ptr - line;
-+ spell_attr = get_spell_attr((colnr_T)v - 1, col, ml_get_buf(wp->w_buffer, lnum, FALSE));
-+ if (!area_attr && !char_attr)
-+ char_attr = spell_attr;
- }
- #endif
++ spell_attr = get_spell_attr((colnr_T)v - 1, col,
++ ml_get_buf(wp->w_buffer,
++ lnum, FALSE));
++ if (area_attr == 0 && search_attr == 0 && spell_attr)
++ char_attr = spell_attr;
++ }
++#endif
#ifdef FEAT_LINEBREAK
-diff -Nur vim60am.old/src/spell/config.h vim60am/src/spell/config.h
---- vim60am.old/src/spell/config.h Thu Jan 1 01:00:00 1970
-+++ vim60am/src/spell/config.h Wed Jun 27 19:16:50 2001
+ /*
+ * 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
@@ -0,0 +1,846 @@
+#include "local.h" /* local definitions for options */
+
+** character counts as two!
+*/
+#ifndef MAXSTRINGCHARS
-+#define MAXSTRINGCHARS 100
++#define MAXSTRINGCHARS 512
+#endif /* MAXSTRINGCHARS */
+
+/*
+#endif /* COUNTSUFFIX */
+#define SIGNAL_TYPE_STRING "void"
+#define MASKTYPE_STRING "long"
-diff -Nur vim60am.old/src/spell/good.c vim60am/src/spell/good.c
---- vim60am.old/src/spell/good.c Thu Jan 1 01:00:00 1970
-+++ vim60am/src/spell/good.c Wed Jun 27 19:16:51 2001
+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
@@ -0,0 +1,400 @@
+#ifndef lint
+static char Rcs_Id[] =
+ if (sufflag > 0)
+ (void) putchar (sufflag);
+}
-diff -Nur vim60am.old/src/spell/hash.c vim60am/src/spell/hash.c
---- vim60am.old/src/spell/hash.c Thu Jan 1 01:00:00 1970
-+++ vim60am/src/spell/hash.c Wed Jun 27 19:16:51 2001
+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
@@ -0,0 +1,91 @@
+/*
+ * hash.c - a simple hash function for ispell
+ }
+ return (unsigned long) h % hashtblsize;
+}
-diff -Nur vim60am.old/src/spell/i_proto.h vim60am/src/spell/i_proto.h
---- vim60am.old/src/spell/i_proto.h Thu Jan 1 01:00:00 1970
-+++ vim60am/src/spell/i_proto.h Wed Jun 27 19:16:51 2001
+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
@@ -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 -Nur vim60am.old/src/spell/ispell.h vim60am/src/spell/ispell.h
---- vim60am.old/src/spell/ispell.h Thu Jan 1 01:00:00 1970
-+++ vim60am/src/spell/ispell.h Wed Jun 27 19:16:51 2001
-@@ -0,0 +1,619 @@
+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
+@@ -0,0 +1,611 @@
+/*
+ * $Id$
+ */
+#define SPELL_MAGIC 0x9602
+
+/* compile options, put in the hash header for consistency checking */
-+#ifdef NO8BIT
-+# define MAGIC8BIT 0x01
-+#else
-+# define MAGIC8BIT 0x00
-+#endif
-+#ifdef NO_CAPITALIZATION_SUPPORT
-+# define MAGICCAPITALIZATION 0x00
-+#else
-+# define MAGICCAPITALIZATION 0x02
-+#endif
++# define MAGICNOTUSED1 0x01
++# define MAGICNOTUSED2 0x02
+#if MASKBITS <= 32
+# define MAGICMASKSET 0x00
+#else
+# endif
+#endif
+
-+#define COMPILEOPTIONS (MAGIC8BIT | MAGICCAPITALIZATION | MAGICMASKSET)
++#define COMPILEOPTIONS (MAGICNOTUSED1 | MAGICNOTUSED2 | MAGICMASKSET)
+
+/*
+ * Structure used to record data about successful lookups; these values
+S_INIT (char LaTeX_Mode, 'P');
+
+#include "i_proto.h"
-diff -Nur vim60am.old/src/spell/local.h vim60am/src/spell/local.h
---- vim60am.old/src/spell/local.h Thu Jan 1 01:00:00 1970
-+++ vim60am/src/spell/local.h Wed Jun 27 19:16:51 2001
+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
@@ -0,0 +1,338 @@
+/*
+ * Written by Eli Zaretskii <eliz@is.elta.co.il>
+#define HASHSUFFIX ".hash"
+#define STATSUFFIX ".sta"
+#define COUNTSUFFIX ".cnt"
-diff -Nur vim60am.old/src/spell/lookup.c vim60am/src/spell/lookup.c
---- vim60am.old/src/spell/lookup.c Thu Jan 1 01:00:00 1970
-+++ vim60am/src/spell/lookup.c Wed Jun 27 19:16:52 2001
+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
@@ -0,0 +1,534 @@
+#ifndef lint
+static char Rcs_Id[] =
+ else
+ return NULL;
+}
-diff -Nur vim60am.old/src/spell/makedent.c vim60am/src/spell/makedent.c
---- vim60am.old/src/spell/makedent.c Thu Jan 1 01:00:00 1970
-+++ vim60am/src/spell/makedent.c Wed Jun 27 19:16:52 2001
+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
@@ -0,0 +1,1107 @@
+/*
+ * Copyright 1988, 1989, 1992, 1993, Geoff Kuenning, Granada Hills, CA
+ }
+ return(NULL);
+}
-diff -Nur vim60am.old/src/spell/msgs.h vim60am/src/spell/msgs.h
---- vim60am.old/src/spell/msgs.h Thu Jan 1 01:00:00 1970
-+++ vim60am/src/spell/msgs.h Wed Jun 27 19:16:52 2001
+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
@@ -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 -Nur vim60am.old/src/spell/tgood.c vim60am/src/spell/tgood.c
---- vim60am.old/src/spell/tgood.c Thu Jan 1 01:00:00 1970
-+++ vim60am/src/spell/tgood.c Wed Jun 27 19:16:55 2001
+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
@@ -0,0 +1,654 @@
+/*
+ * Copyright 1987, 1988, 1989, 1992, 1993, Geoff Kuenning, Granada Hills, CA
+ for ( ; --len >= 0; dst++)
+ *dst = mytolower (*dst);
+ }
-diff -Nur vim60am.old/src/spell/tree.c vim60am/src/spell/tree.c
---- vim60am.old/src/spell/tree.c Thu Jan 1 01:00:00 1970
-+++ vim60am/src/spell/tree.c Wed Jun 27 19:16:55 2001
+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
@@ -0,0 +1,748 @@
+/*
+ * tree.c - a hash style dictionary for user's personal words
+ return NULL;
+}
+#endif /* REGEX_LOOKUP */
-diff -Nur vim60am.old/src/spell/util.c vim60am/src/spell/util.c
---- vim60am.old/src/spell/util.c Thu Jan 1 01:00:00 1970
-+++ vim60am/src/spell/util.c Wed Jun 27 19:16:55 2001
+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
@@ -0,0 +1,351 @@
+#include <ctype.h>
+#include "ispell.h"
+ }
+ return(NULL);
+}
-diff -Nur vim60am.old/src/spell/version.h vim60am/src/spell/version.h
---- vim60am.old/src/spell/version.h Thu Jan 1 01:00:00 1970
-+++ vim60am/src/spell/version.h Wed Jun 27 19:16:55 2001
+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
@@ -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 -Nur vim60am.old/src/spell/wm.h vim60am/src/spell/wm.h
---- vim60am.old/src/spell/wm.h Thu Jan 1 01:00:00 1970
-+++ vim60am/src/spell/wm.h Wed Jun 27 19:16:55 2001
+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
@@ -0,0 +1,12 @@
+#ifndef Public
+enum _logical {False,True};
+#define Public
+#define Local static
+#endif
-diff -Nur vim60am.old/src/spell.c vim60am/src/spell.c
---- vim60am.old/src/spell.c Thu Jan 1 01:00:00 1970
-+++ vim60am/src/spell.c Tue Jul 3 13:44:50 2001
+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
@@ -0,0 +1,183 @@
+#include "spell/wm.h"
+#include "vim.h"
+ treeoutput ();
+}
+#endif
-diff -Nur vim60am.old/src/syntax.c vim60am/src/syntax.c
---- vim60am.old/src/syntax.c Wed Jul 4 20:42:09 2001
-+++ vim60am/src/syntax.c Tue Jul 3 18:34:18 2001
-@@ -5771,6 +5771,9 @@
+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 @@
"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
};
-@@ -5790,6 +5793,9 @@
- "Folded term=standout ctermbg=Grey ctermfg=DarkBlue guibg=LightGrey guifg=DarkBlue",
+@@ -5942,6 +5945,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",
+#ifdef FEAT_SPELL_HL
+ "Spell term=reverse ctermbg=NONE ctermfg=White guibg=NONE guifg=Red",
"DiffChange term=bold ctermbg=LightMagenta guibg=LightMagenta",
"DiffDelete term=bold ctermfg=Blue ctermbg=LightCyan gui=bold guifg=Blue guibg=LightCyan",
NULL
-@@ -5810,6 +5816,9 @@
- "Folded term=standout ctermbg=DarkGrey ctermfg=Cyan guibg=DarkGrey guifg=Cyan",
+@@ -5963,6 +5969,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",
+#ifdef FEAT_SPELL_HL
+ "Spell term=reverse ctermbg=NONE ctermfg=White guibg=NONE guifg=Red",
"DiffChange term=bold ctermbg=DarkMagenta guibg=DarkMagenta",
"DiffDelete term=bold ctermfg=Blue ctermbg=DarkCyan gui=bold guifg=Blue guibg=DarkCyan",
NULL
-diff -Nur vim60am.old/src/version.c vim60am/src/version.c
---- vim60am.old/src/version.c Wed Jul 4 20:42:09 2001
-+++ vim60am/src/version.c Tue Jul 3 18:33:34 2001
-@@ -416,6 +416,11 @@
+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
+@@ -474,6 +474,11 @@
#else
"-syntax",
#endif
/* only interesting on Unix systems */
#if defined(USE_SYSTEM) && (defined(UNIX) || defined(__EMX__))
"+system()",
-@@ -953,7 +958,7 @@
+@@ -2201,7 +2206,7 @@
int add_version;
int attr;
{
int col;
char_u *p;
int l;
-diff -Nur vim60am.old/src/version.h vim60am/src/version.h
---- vim60am.old/src/version.h Wed Jul 4 20:42:09 2001
-+++ vim60am/src/version.h Tue Jul 3 19:04:36 2001
-@@ -33,6 +33,10 @@
+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
+@@ -35,6 +35,10 @@
*/
- #define VIM_VERSION_NODOT "vim60"
- #define VIM_VERSION_SHORT "6.0"
+ #define VIM_VERSION_NODOT "vim63"
+ #define VIM_VERSION_SHORT "6.3"
+#ifdef FEAT_SPELL_HL
-+#define VIM_VERSION_MEDIUM "6.0 + ispell 3.1.20 WM-3"
++#define VIM_VERSION_MEDIUM "6.3 + ispell 3.1.20 WM-3"
+#else
- #define VIM_VERSION_MEDIUM "6.0"
-+#endif
- #define VIM_VERSION_LONG "VIM - Vi IMproved 6.0 (2001 Sep 26)"
- #define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 6.0 (2001 Sep 26, compiled "
-diff -Nur vim60am.old/src/vim.h vim60am/src/vim.h
---- vim60am.old/src/vim.h Wed Jul 4 20:42:09 2001
-+++ vim60am/src/vim.h Tue Jul 3 18:21:26 2001
-@@ -980,13 +980,14 @@
- , HLF_CHD /* Changed diff line */
+ #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 @@
, HLF_DED /* Deleted diff line */
, HLF_TXD /* Text Changed in diff line */
-+ , HLF_SPELL /* spell - string not in dictionary WM */
+ , HLF_SC /* Sign column */
++ , HLF_SPELL /* spell - string in dictionary WM */
, HLF_COUNT /* MUST be the last one */
};
/* the HL_FLAGS must be in the same order as the HLF_ enums! */
#define HL_FLAGS {'8', '@', 'd', 'e', 'h', 'i', 'l', 'm', 'M', \
'n', 'r', 's', 'S', 'c', 't', 'v', 'V', 'w', 'W', \
-- 'f', 'F', 'A', 'C', 'D', 'T'}
-+ 'f', 'F', 'A', 'C', 'D', 'T', 'Z'}
+- 'f', 'F', 'A', 'C', 'D', 'T', '>'}
++ 'f', 'F', 'A', 'C', 'D', 'T', '>', 'Z'}
/*
* Boolean constants
projects / packages / vim.git / blobdiff