-diff -Nur vim61.orig/src/Makefile vim61/src/Makefile
---- vim61.orig/src/Makefile Sun Mar 24 11:41:30 2002
-+++ vim61/src/Makefile Wed Mar 27 15:08:07 2002
-@@ -1095,6 +1095,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 ##
-@@ -1105,7 +1121,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)
-@@ -1185,6 +1201,7 @@
- screen.c \
- search.c \
- syntax.c \
-+ $(SPELL_SRC) \
- tag.c \
- term.c \
- ui.c \
-@@ -1250,6 +1267,7 @@
- objects/screen.o \
- objects/search.o \
- objects/syntax.o \
-+ $(SPELL_OBJ) \
- $(SNIFF_OBJ) \
- objects/tag.o \
- objects/term.o \
-@@ -2163,6 +2181,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
-
-@@ -2281,6 +2302,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
-@@ -2403,3 +2427,26 @@
- objects/netbeans.o: netbeans.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 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 -Nur vim61.orig/src/edit.c vim61/src/edit.c
---- vim61.orig/src/edit.c Sun Mar 24 12:09:53 2002
-+++ vim61/src/edit.c Wed Mar 27 15:08:07 2002
-@@ -619,7 +619,11 @@
+diff -ruN vim62./src/edit.c vim62/src/edit.c
+--- vim62./src/edit.c 2003-05-29 20:35:21.000000000 +0200
++++ vim62/src/edit.c 2003-06-02 19:57:21.000000000 +0200
+@@ -656,7 +656,11 @@
if ((c == Ctrl_V || c == Ctrl_Q) && ctrl_x_mode == CTRL_X_CMDLINE)
goto docomplete;
#endif
{
ins_ctrl_v();
c = Ctrl_V; /* pretend CTRL-V is last typed character */
-@@ -1146,6 +1150,20 @@
+@@ -1222,6 +1226,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 vim61.orig/src/ex_cmds.h vim61/src/ex_cmds.h
---- vim61.orig/src/ex_cmds.h Sat Dec 15 18:24:11 2001
-+++ vim61/src/ex_cmds.h Wed Mar 27 15:08:07 2002
-@@ -700,6 +700,8 @@
+diff -ruN vim62./src/eval.c vim62/src/eval.c
+--- vim62./src/eval.c 2003-05-30 21:11:19.000000000 +0200
++++ vim62/src/eval.c 2003-06-02 19:57:21.000000000 +0200
+@@ -4864,6 +4864,9 @@
+ #ifdef FEAT_SNIFF
+ "sniff",
+ #endif
++#ifdef FEAT_SPELL_HL
++ "spell",
++#endif
+ #ifdef FEAT_STL_OPT
+ "statusline",
+ #endif
+diff -ruN vim62./src/ex_cmds.h vim62/src/ex_cmds.h
+--- vim62./src/ex_cmds.h 2003-05-23 19:13:14.000000000 +0200
++++ vim62/src/ex_cmds.h 2003-06-02 19:57:21.000000000 +0200
+@@ -712,6 +712,8 @@
BANG|FILE1|TRLBAR|SBOXOK|CMDWIN),
EX(CMD_split, "split", ex_splitview,
BANG|FILE1|RANGE|NOTADR|EDITCMD|ARGOPT|TRLBAR),
EX(CMD_sprevious, "sprevious", ex_previous,
EXTRA|RANGE|NOTADR|COUNT|BANG|EDITCMD|ARGOPT|TRLBAR),
EX(CMD_srewind, "srewind", ex_rewind,
-diff -Nur vim61.orig/src/ex_docmd.c vim61/src/ex_docmd.c
---- vim61.orig/src/ex_docmd.c Fri Mar 22 20:30:29 2002
-+++ vim61/src/ex_docmd.c Wed Mar 27 15:08:08 2002
-@@ -214,6 +214,9 @@
+diff -ruN vim62./src/ex_docmd.c vim62/src/ex_docmd.c
+--- vim62./src/ex_docmd.c 2003-05-24 19:31:40.000000000 +0200
++++ vim62/src/ex_docmd.c 2003-06-02 19:57:21.000000000 +0200
+@@ -215,6 +215,9 @@
#ifndef FEAT_SYN_HL
# define ex_syntax ex_ni
#endif
#ifndef FEAT_PERL
# define ex_perl ex_ni
# define ex_perldo ex_ni
-@@ -2722,6 +2725,12 @@
+@@ -3079,6 +3082,12 @@
set_context_in_syntax_cmd(xp, arg);
break;
#endif
#ifdef FEAT_EVAL
case CMD_let:
case CMD_if:
-diff -Nur vim61.orig/src/feature.h vim61/src/feature.h
---- vim61.orig/src/feature.h Sat Mar 9 16:17:30 2002
-+++ vim61/src/feature.h Wed Mar 27 15:08:08 2002
-@@ -312,6 +312,11 @@
+diff -ruN vim62./src/feature.h vim62/src/feature.h
+--- vim62./src/feature.h 2003-05-25 19:44:49.000000000 +0200
++++ vim62/src/feature.h 2003-06-02 19:57:21.000000000 +0200
+@@ -314,6 +314,11 @@
+ # define FEAT_RIGHTLEFT
# endif
- # define FEAT_FKMAP
#endif
+#ifdef FEAT_BIG
+#undef FEAT_RIGHTLEFT
+/* # define FEAT_PRINTER */
/*
- * +emacs_tags When FEAT_EMACS_TAGS defined: Include support for
-diff -Nur vim61.orig/src/globals.h vim61/src/globals.h
---- vim61.orig/src/globals.h Sun Mar 17 14:10:52 2002
-+++ vim61/src/globals.h Wed Mar 27 15:08:08 2002
-@@ -749,6 +749,9 @@
+ * +arabic Arabic keymap and shaping support.
+diff -ruN vim62./src/globals.h vim62/src/globals.h
+--- vim62./src/globals.h 2003-05-28 20:24:00.000000000 +0200
++++ vim62/src/globals.h 2003-06-02 19:57:21.000000000 +0200
+@@ -846,6 +846,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 vim61.orig/src/main.c vim61/src/main.c
---- vim61.orig/src/main.c Sun Mar 24 12:05:17 2002
-+++ vim61/src/main.c Wed Mar 27 15:08:08 2002
-@@ -2068,6 +2068,9 @@
+diff -ruN vim62./src/main.c vim62/src/main.c
+--- vim62./src/main.c 2003-05-29 11:20:15.000000000 +0200
++++ vim62/src/main.c 2003-06-02 19:57:21.000000000 +0200
+@@ -2202,6 +2202,9 @@
}
}
#endif /* FEAT_VIMINFO */
#ifdef FEAT_AUTOCMD
apply_autocmds(EVENT_VIMLEAVE, NULL, NULL, FALSE, curbuf);
-diff -Nur vim61.orig/src/normal.c vim61/src/normal.c
---- vim61.orig/src/normal.c Sun Mar 24 12:36:35 2002
-+++ vim61/src/normal.c Wed Mar 27 15:08:08 2002
-@@ -83,6 +83,10 @@
+diff -ruN vim62./src/Makefile vim62/src/Makefile
+--- vim62./src/Makefile 2003-06-01 15:18:29.000000000 +0200
++++ vim62/src/Makefile 2003-06-02 20:02:03.000000000 +0200
+@@ -1156,6 +1156,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 ##
+@@ -1166,7 +1182,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)
+@@ -1248,6 +1264,7 @@
+ screen.c \
+ search.c \
+ syntax.c \
++ $(SPELL_SRC) \
+ tag.c \
+ term.c \
+ ui.c \
+@@ -1314,6 +1331,7 @@
+ objects/screen.o \
+ objects/search.o \
+ objects/syntax.o \
++ $(SPELL_OBJ) \
+ $(SNIFF_OBJ) \
+ objects/tag.o \
+ objects/term.o \
+@@ -2252,6 +2270,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
+
+@@ -2410,6 +2431,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 \
+@@ -2558,3 +2582,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 -ruN vim62./src/normal.c vim62/src/normal.c
+--- vim62./src/normal.c 2003-05-21 16:44:35.000000000 +0200
++++ vim62/src/normal.c 2003-06-02 19:57:21.000000000 +0200
+@@ -84,6 +84,10 @@
#ifdef FEAT_VISUAL
static int get_visual_text __ARGS((cmdarg_T *cap, char_u **pp, int *lenp));
#endif
static void nv_tagpop __ARGS((cmdarg_T *cap));
static void nv_scroll __ARGS((cmdarg_T *cap));
static void nv_right __ARGS((cmdarg_T *cap));
-@@ -224,9 +228,17 @@
+@@ -231,9 +235,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
-@@ -7399,6 +7411,28 @@
+@@ -7574,6 +7586,28 @@
#endif
}
#ifdef FEAT_VISUAL
/*
* In exclusive Visual mode, may include the last character.
-diff -Nur vim61.orig/src/option.c vim61/src/option.c
---- vim61.orig/src/option.c Sat Mar 9 16:17:30 2002
-+++ vim61/src/option.c Wed Mar 27 15:08:08 2002
-@@ -116,6 +116,8 @@
+diff -ruN vim62./src/option.c vim62/src/option.c
+--- vim62./src/option.c 2003-05-29 17:13:38.000000000 +0200
++++ vim62/src/option.c 2003-06-02 19:57:21.000000000 +0200
+@@ -121,6 +121,8 @@
, PV_SW
, PV_SWF
, PV_SYN
, PV_TAGS
, PV_TS
, PV_TSR
-@@ -213,6 +215,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;
-@@ -998,7 +1004,7 @@
+@@ -1052,7 +1058,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,
-@@ -1262,6 +1268,13 @@
+@@ -1317,6 +1323,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,
-@@ -1837,6 +1850,14 @@
+@@ -1915,6 +1928,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,
-@@ -4483,6 +4504,26 @@
+@@ -4690,6 +4711,26 @@
errmsg = e_invarg;
}
#endif
#ifdef FEAT_MBYTE
/* 'encoding' and 'fileencoding' */
-@@ -7258,6 +7299,10 @@
+@@ -7725,6 +7766,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 -Nur vim61.orig/src/option.h vim61/src/option.h
---- vim61.orig/src/option.h Wed Mar 6 22:16:36 2002
-+++ vim61/src/option.h Wed Mar 27 15:08:08 2002
-@@ -349,6 +349,8 @@
+diff -ruN vim62./src/option.h vim62/src/option.h
+--- vim62./src/option.h 2003-05-17 21:02:23.000000000 +0200
++++ vim62/src/option.h 2003-06-02 19:57:21.000000000 +0200
+@@ -371,6 +371,8 @@
EXTERN char_u *p_dex; /* 'diffexpr' */
# endif
#endif
#ifdef FEAT_INS_EXPAND
EXTERN char_u *p_dict; /* 'dictionary' */
#endif
-diff -Nur vim61.orig/src/proto/spell.pro vim61/src/proto/spell.pro
---- vim61.orig/src/proto/spell.pro Thu Jan 1 01:00:00 1970
-+++ vim61/src/proto/spell.pro Wed Mar 27 15:08:08 2002
+diff -ruN vim62./src/proto/spell.pro vim62/src/proto/spell.pro
+--- vim62./src/proto/spell.pro 1970-01-01 01:00:00.000000000 +0100
++++ vim62/src/proto/spell.pro 2003-06-02 19:57:21.000000000 +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 vim61.orig/src/proto.h vim61/src/proto.h
---- vim61.orig/src/proto.h Thu Aug 16 22:20:55 2001
-+++ vim61/src/proto.h Wed Mar 27 15:08:08 2002
-@@ -64,6 +64,9 @@
+diff -ruN vim62./src/proto.h vim62/src/proto.h
+--- vim62./src/proto.h 2003-05-24 17:27:36.000000000 +0200
++++ vim62/src/proto.h 2003-06-02 19:57:21.000000000 +0200
+@@ -72,6 +72,9 @@
# include "os_qnx.pro"
# endif
# include "buffer.pro"
# include "charset.pro"
# ifdef FEAT_CSCOPE
-diff -Nur vim61.orig/src/screen.c vim61/src/screen.c
---- vim61.orig/src/screen.c Tue Mar 12 20:59:15 2002
-+++ vim61/src/screen.c Wed Mar 27 15:08:08 2002
+diff -ruN vim62./src/screen.c vim62/src/screen.c
+--- vim62./src/screen.c 2003-06-02 19:56:54.000000000 +0200
++++ vim62/src/screen.c 2003-06-02 19:57:21.000000000 +0200
@@ -115,6 +115,9 @@
static match_T match_hl; /* used for ":match" highlight matching */
#endif
#ifdef FEAT_FOLDING
static foldinfo_T win_foldinfo; /* info for 'foldcolumn' */
#endif
-@@ -2362,6 +2365,9 @@
+@@ -2466,6 +2469,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 */
-@@ -2435,8 +2441,18 @@
+@@ -2544,8 +2550,18 @@
#else
extra_check = 0;
#endif
{
/* Prepare for syntax highlighting in this line. When there is an
* error, stop syntax highlighting. */
-@@ -3068,6 +3084,10 @@
+@@ -3196,6 +3212,10 @@
else if (search_attr == 0 && has_syntax)
char_attr = syntax_attr;
#endif
else
char_attr = search_attr;
-@@ -3320,6 +3340,17 @@
+@@ -3510,6 +3530,17 @@
char_attr = syntax_attr;
}
#endif
#ifdef FEAT_LINEBREAK
/*
* Found last space before word: check for line break
-diff -Nur vim61.orig/src/spell/config.h vim61/src/spell/config.h
---- vim61.orig/src/spell/config.h Thu Jan 1 01:00:00 1970
-+++ vim61/src/spell/config.h Wed Mar 27 15:08:08 2002
+diff -ruN vim62./src/spell/config.h vim62/src/spell/config.h
+--- vim62./src/spell/config.h 1970-01-01 01:00:00.000000000 +0100
++++ vim62/src/spell/config.h 2003-06-02 19:57:21.000000000 +0200
@@ -0,0 +1,846 @@
+#include "local.h" /* local definitions for options */
+
+#endif /* COUNTSUFFIX */
+#define SIGNAL_TYPE_STRING "void"
+#define MASKTYPE_STRING "long"
-diff -Nur vim61.orig/src/spell/good.c vim61/src/spell/good.c
---- vim61.orig/src/spell/good.c Thu Jan 1 01:00:00 1970
-+++ vim61/src/spell/good.c Wed Mar 27 15:08:08 2002
+diff -ruN vim62./src/spell/good.c vim62/src/spell/good.c
+--- vim62./src/spell/good.c 1970-01-01 01:00:00.000000000 +0100
++++ vim62/src/spell/good.c 2003-06-02 19:57:21.000000000 +0200
@@ -0,0 +1,400 @@
+#ifndef lint
+static char Rcs_Id[] =
+ if (sufflag > 0)
+ (void) putchar (sufflag);
+}
-diff -Nur vim61.orig/src/spell/hash.c vim61/src/spell/hash.c
---- vim61.orig/src/spell/hash.c Thu Jan 1 01:00:00 1970
-+++ vim61/src/spell/hash.c Wed Mar 27 15:08:08 2002
+diff -ruN vim62./src/spell/hash.c vim62/src/spell/hash.c
+--- vim62./src/spell/hash.c 1970-01-01 01:00:00.000000000 +0100
++++ vim62/src/spell/hash.c 2003-06-02 19:57:21.000000000 +0200
@@ -0,0 +1,91 @@
+/*
+ * hash.c - a simple hash function for ispell
+ }
+ return (unsigned long) h % hashtblsize;
+}
-diff -Nur vim61.orig/src/spell/i_proto.h vim61/src/spell/i_proto.h
---- vim61.orig/src/spell/i_proto.h Thu Jan 1 01:00:00 1970
-+++ vim61/src/spell/i_proto.h Wed Mar 27 15:08:08 2002
+diff -ruN vim62./src/spell/i_proto.h vim62/src/spell/i_proto.h
+--- vim62./src/spell/i_proto.h 1970-01-01 01:00:00.000000000 +0100
++++ vim62/src/spell/i_proto.h 2003-06-02 19:57:21.000000000 +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 vim61.orig/src/spell/ispell.h vim61/src/spell/ispell.h
---- vim61.orig/src/spell/ispell.h Thu Jan 1 01:00:00 1970
-+++ vim61/src/spell/ispell.h Wed Mar 27 15:08:08 2002
+diff -ruN vim62./src/spell/ispell.h vim62/src/spell/ispell.h
+--- vim62./src/spell/ispell.h 1970-01-01 01:00:00.000000000 +0100
++++ vim62/src/spell/ispell.h 2003-06-02 19:57:21.000000000 +0200
@@ -0,0 +1,611 @@
+/*
+ * $Id$
+S_INIT (char LaTeX_Mode, 'P');
+
+#include "i_proto.h"
-diff -Nur vim61.orig/src/spell/local.h vim61/src/spell/local.h
---- vim61.orig/src/spell/local.h Thu Jan 1 01:00:00 1970
-+++ vim61/src/spell/local.h Wed Mar 27 15:08:08 2002
+diff -ruN vim62./src/spell/local.h vim62/src/spell/local.h
+--- vim62./src/spell/local.h 1970-01-01 01:00:00.000000000 +0100
++++ vim62/src/spell/local.h 2003-06-02 19:57:21.000000000 +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 vim61.orig/src/spell/lookup.c vim61/src/spell/lookup.c
---- vim61.orig/src/spell/lookup.c Thu Jan 1 01:00:00 1970
-+++ vim61/src/spell/lookup.c Wed Mar 27 15:08:08 2002
+diff -ruN vim62./src/spell/lookup.c vim62/src/spell/lookup.c
+--- vim62./src/spell/lookup.c 1970-01-01 01:00:00.000000000 +0100
++++ vim62/src/spell/lookup.c 2003-06-02 19:57:21.000000000 +0200
@@ -0,0 +1,534 @@
+#ifndef lint
+static char Rcs_Id[] =
+ else
+ return NULL;
+}
-diff -Nur vim61.orig/src/spell/makedent.c vim61/src/spell/makedent.c
---- vim61.orig/src/spell/makedent.c Thu Jan 1 01:00:00 1970
-+++ vim61/src/spell/makedent.c Wed Mar 27 15:08:08 2002
+diff -ruN vim62./src/spell/makedent.c vim62/src/spell/makedent.c
+--- vim62./src/spell/makedent.c 1970-01-01 01:00:00.000000000 +0100
++++ vim62/src/spell/makedent.c 2003-06-02 19:57:21.000000000 +0200
@@ -0,0 +1,1107 @@
+/*
+ * Copyright 1988, 1989, 1992, 1993, Geoff Kuenning, Granada Hills, CA
+ }
+ return(NULL);
+}
-diff -Nur vim61.orig/src/spell/msgs.h vim61/src/spell/msgs.h
---- vim61.orig/src/spell/msgs.h Thu Jan 1 01:00:00 1970
-+++ vim61/src/spell/msgs.h Wed Mar 27 15:08:08 2002
+diff -ruN vim62./src/spell/msgs.h vim62/src/spell/msgs.h
+--- vim62./src/spell/msgs.h 1970-01-01 01:00:00.000000000 +0100
++++ vim62/src/spell/msgs.h 2003-06-02 19:57:21.000000000 +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 vim61.orig/src/spell/tgood.c vim61/src/spell/tgood.c
---- vim61.orig/src/spell/tgood.c Thu Jan 1 01:00:00 1970
-+++ vim61/src/spell/tgood.c Wed Mar 27 15:08:08 2002
+diff -ruN vim62./src/spell/tgood.c vim62/src/spell/tgood.c
+--- vim62./src/spell/tgood.c 1970-01-01 01:00:00.000000000 +0100
++++ vim62/src/spell/tgood.c 2003-06-02 19:57:21.000000000 +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 vim61.orig/src/spell/tree.c vim61/src/spell/tree.c
---- vim61.orig/src/spell/tree.c Thu Jan 1 01:00:00 1970
-+++ vim61/src/spell/tree.c Wed Mar 27 15:08:08 2002
+diff -ruN vim62./src/spell/tree.c vim62/src/spell/tree.c
+--- vim62./src/spell/tree.c 1970-01-01 01:00:00.000000000 +0100
++++ vim62/src/spell/tree.c 2003-06-02 19:57:21.000000000 +0200
@@ -0,0 +1,748 @@
+/*
+ * tree.c - a hash style dictionary for user's personal words
+ return NULL;
+}
+#endif /* REGEX_LOOKUP */
-diff -Nur vim61.orig/src/spell/util.c vim61/src/spell/util.c
---- vim61.orig/src/spell/util.c Thu Jan 1 01:00:00 1970
-+++ vim61/src/spell/util.c Wed Mar 27 15:08:08 2002
+diff -ruN vim62./src/spell/util.c vim62/src/spell/util.c
+--- vim62./src/spell/util.c 1970-01-01 01:00:00.000000000 +0100
++++ vim62/src/spell/util.c 2003-06-02 19:57:21.000000000 +0200
@@ -0,0 +1,351 @@
+#include <ctype.h>
+#include "ispell.h"
+ }
+ return(NULL);
+}
-diff -Nur vim61.orig/src/spell/version.h vim61/src/spell/version.h
---- vim61.orig/src/spell/version.h Thu Jan 1 01:00:00 1970
-+++ vim61/src/spell/version.h Wed Mar 27 15:08:08 2002
+diff -ruN vim62./src/spell/version.h vim62/src/spell/version.h
+--- vim62./src/spell/version.h 1970-01-01 01:00:00.000000000 +0100
++++ vim62/src/spell/version.h 2003-06-02 19:57:21.000000000 +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 vim61.orig/src/spell/wm.h vim61/src/spell/wm.h
---- vim61.orig/src/spell/wm.h Thu Jan 1 01:00:00 1970
-+++ vim61/src/spell/wm.h Wed Mar 27 15:08:08 2002
+diff -ruN vim62./src/spell/wm.h vim62/src/spell/wm.h
+--- vim62./src/spell/wm.h 1970-01-01 01:00:00.000000000 +0100
++++ vim62/src/spell/wm.h 2003-06-02 19:57:21.000000000 +0200
@@ -0,0 +1,12 @@
+#ifndef Public
+enum _logical {False,True};
+#define Public
+#define Local static
+#endif
-diff -Nur vim61.orig/src/spell.c vim61/src/spell.c
---- vim61.orig/src/spell.c Thu Jan 1 01:00:00 1970
-+++ vim61/src/spell.c Wed Mar 27 15:08:08 2002
+diff -ruN vim62./src/spell.c vim62/src/spell.c
+--- vim62./src/spell.c 1970-01-01 01:00:00.000000000 +0100
++++ vim62/src/spell.c 2003-06-02 19:57:21.000000000 +0200
@@ -0,0 +1,183 @@
+#include "spell/wm.h"
+#include "vim.h"
+ treeoutput ();
+}
+#endif
-diff -Nur vim61.orig/src/syntax.c vim61/src/syntax.c
---- vim61.orig/src/syntax.c Thu Feb 21 21:11:38 2002
-+++ vim61/src/syntax.c Wed Mar 27 15:08:08 2002
-@@ -5859,6 +5859,9 @@
+diff -ruN vim62./src/syntax.c vim62/src/syntax.c
+--- vim62./src/syntax.c 2003-05-02 20:50:03.000000000 +0200
++++ vim62/src/syntax.c 2003-06-02 19:57:21.000000000 +0200
+@@ -5887,6 +5887,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
};
-@@ -5878,6 +5881,9 @@
+@@ -5906,6 +5909,9 @@
"Folded term=standout ctermbg=Grey ctermfg=DarkBlue guibg=LightGrey guifg=DarkBlue",
"FoldColumn 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
-@@ -5898,6 +5904,9 @@
+@@ -5926,6 +5932,9 @@
"Folded term=standout ctermbg=DarkGrey ctermfg=Cyan guibg=DarkGrey guifg=Cyan",
"FoldColumn 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 -Nur vim61.orig/src/version.c vim61/src/version.c
---- vim61.orig/src/version.c Fri Mar 22 21:20:55 2002
-+++ vim61/src/version.c Wed Mar 27 15:08:08 2002
-@@ -455,6 +455,11 @@
+diff -ruN vim62./src/version.c vim62/src/version.c
+--- vim62./src/version.c 2003-06-01 12:18:15.000000000 +0200
++++ vim62/src/version.c 2003-06-02 19:57:21.000000000 +0200
+@@ -470,6 +470,11 @@
#else
"-syntax",
#endif
/* only interesting on Unix systems */
#if defined(USE_SYSTEM) && (defined(UNIX) || defined(__EMX__))
"+system()",
-@@ -1048,7 +1053,7 @@
+@@ -1103,7 +1108,7 @@
int add_version;
int attr;
{
int col;
char_u *p;
int l;
-diff -Nur vim61.orig/src/version.h vim61/src/version.h
---- vim61.orig/src/version.h Fri Mar 22 21:07:59 2002
-+++ vim61/src/version.h Wed Mar 27 15:09:43 2002
+diff -ruN vim62./src/version.h vim62/src/version.h
+--- vim62./src/version.h 2003-06-01 12:19:20.000000000 +0200
++++ vim62/src/version.h 2003-06-02 20:03:17.000000000 +0200
@@ -35,6 +35,10 @@
*/
- #define VIM_VERSION_NODOT "vim61"
- #define VIM_VERSION_SHORT "6.1"
+ #define VIM_VERSION_NODOT "vim62"
+ #define VIM_VERSION_SHORT "6.2"
+#ifdef FEAT_SPELL_HL
-+#define VIM_VERSION_MEDIUM "6.1 + ispell 3.1.20 WM-3"
++#define VIM_VERSION_MEDIUM "6.2 + ispell 3.1.20 WM-3"
+#else
- #define VIM_VERSION_MEDIUM "6.1"
-+#endif
- #define VIM_VERSION_LONG "VIM - Vi IMproved 6.1 (2002 Mar 24)"
- #define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 6.1 (2002 Mar 24, compiled "
-diff -Nur vim61.orig/src/vim.h vim61/src/vim.h
---- vim61.orig/src/vim.h Tue Mar 12 21:23:45 2002
-+++ vim61/src/vim.h Wed Mar 27 15:08:08 2002
-@@ -1048,13 +1048,14 @@
+ #define VIM_VERSION_MEDIUM "6.2"
++#endif
+ #define VIM_VERSION_LONG "VIM - Vi IMproved 6.2 (2003 Jun 1)"
+ #define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 6.2 (2003 Jun 1, compiled "
+diff -ruN vim62./src/vim.h vim62/src/vim.h
+--- vim62./src/vim.h 2003-05-29 11:32:47.000000000 +0200
++++ vim62/src/vim.h 2003-06-02 19:57:21.000000000 +0200
+@@ -1059,13 +1059,14 @@
, HLF_CHD /* Changed diff line */
, HLF_DED /* Deleted diff line */
, HLF_TXD /* Text Changed in diff line */
/*
* Boolean constants
---- vim61/src/eval.c.ispell Tue Oct 8 14:57:16 2002
-+++ vim61/src/eval.c Tue Oct 8 14:58:49 2002
-@@ -4334,6 +4334,9 @@
- #ifdef FEAT_SNIFF
- "sniff",
- #endif
-+#ifdef FEAT_SPELL_HL
-+ "spell",
-+#endif
- #ifdef FEAT_STL_OPT
- "statusline",
- #endif
projects / packages / vim.git / commitdiff