From 0f1b3689ba61a7b996af1d2d90817be90e7c758e Mon Sep 17 00:00:00 2001
From: =?utf8?q?Adam=20Go=C5=82=C4=99biowski?= <adamg@pld-linux.org>
Date: Mon, 1 Mar 2004 22:54:59 +0000
Subject: [PATCH] - removed conflict with 6.2.259 - verified to apply cleanly
 with vim 6.2.307

Changed files:
    vim-ispell.patch -> 1.15
---
 vim-ispell.patch | 267 ++++++++++++++++++++++++-----------------------
 1 file changed, 134 insertions(+), 133 deletions(-)

diff --git a/vim-ispell.patch b/vim-ispell.patch
index fc298f5..1672ed7 100644
--- a/vim-ispell.patch
+++ b/vim-ispell.patch
@@ -1,7 +1,7 @@
-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 @@
+diff -burN vim62.orig/src/edit.c vim62/src/edit.c
+--- vim62.orig/src/edit.c	2004-03-01 22:36:43.648638472 +0100
++++ vim62/src/edit.c	2004-03-01 22:43:14.048288704 +0100
+@@ -654,7 +654,11 @@
  	if ((c == Ctrl_V || c == Ctrl_Q) && ctrl_x_mode == CTRL_X_CMDLINE)
  	    goto docomplete;
  #endif
@@ -14,7 +14,7 @@ diff -ruN vim62./src/edit.c vim62/src/edit.c
  	{
  	    ins_ctrl_v();
  	    c = Ctrl_V;	/* pretend CTRL-V is last typed character */
-@@ -1222,6 +1226,20 @@
+@@ -1220,6 +1224,20 @@
  		continue_status = 0;
  	    break;
  #endif /* FEAT_INS_EXPAND */
@@ -35,10 +35,10 @@ diff -ruN vim62./src/edit.c vim62/src/edit.c
  
  	case Ctrl_Y:		/* copy from previous line or scroll down */
  	case Ctrl_E:		/* copy from next line	   or scroll up */
-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 @@
+diff -burN vim62.orig/src/eval.c vim62/src/eval.c
+--- vim62.orig/src/eval.c	2004-03-01 22:36:43.651638016 +0100
++++ vim62/src/eval.c	2004-03-01 22:43:14.085283080 +0100
+@@ -4942,6 +4942,9 @@
  #ifdef FEAT_SNIFF
  	"sniff",
  #endif
@@ -48,10 +48,10 @@ diff -ruN vim62./src/eval.c vim62/src/eval.c
  #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 @@
+diff -burN vim62.orig/src/ex_cmds.h vim62/src/ex_cmds.h
+--- vim62.orig/src/ex_cmds.h	2004-03-01 22:36:43.680633608 +0100
++++ vim62/src/ex_cmds.h	2004-03-01 22:43:14.109279432 +0100
+@@ -726,6 +726,8 @@
  			BANG|FILE1|TRLBAR|SBOXOK|CMDWIN),
  EX(CMD_split,		"split",	ex_splitview,
  			BANG|FILE1|RANGE|NOTADR|EDITCMD|ARGOPT|TRLBAR),
@@ -60,10 +60,10 @@ diff -ruN vim62./src/ex_cmds.h vim62/src/ex_cmds.h
  EX(CMD_sprevious,	"sprevious",	ex_previous,
  			EXTRA|RANGE|NOTADR|COUNT|BANG|EDITCMD|ARGOPT|TRLBAR),
  EX(CMD_srewind,		"srewind",	ex_rewind,
-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 @@
+diff -burN vim62.orig/src/ex_docmd.c vim62/src/ex_docmd.c
+--- vim62.orig/src/ex_docmd.c	2004-03-01 22:36:43.717627984 +0100
++++ vim62/src/ex_docmd.c	2004-03-01 22:43:14.144274112 +0100
+@@ -214,6 +214,9 @@
  #ifndef FEAT_SYN_HL
  # define ex_syntax		ex_ni
  #endif
@@ -73,7 +73,7 @@ diff -ruN vim62./src/ex_docmd.c vim62/src/ex_docmd.c
  #ifndef FEAT_PERL
  # define ex_perl		ex_ni
  # define ex_perldo		ex_ni
-@@ -3079,6 +3082,12 @@
+@@ -3389,6 +3392,12 @@
  	    set_context_in_syntax_cmd(xp, arg);
  	    break;
  #endif
@@ -86,9 +86,9 @@ diff -ruN vim62./src/ex_docmd.c vim62/src/ex_docmd.c
  #ifdef FEAT_EVAL
  	case CMD_let:
  	case CMD_if:
-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
+diff -burN vim62.orig/src/feature.h vim62/src/feature.h
+--- vim62.orig/src/feature.h	2004-03-01 22:36:43.377679664 +0100
++++ vim62/src/feature.h	2004-03-01 22:43:14.169270312 +0100
 @@ -314,6 +314,11 @@
  #   define FEAT_RIGHTLEFT
  # endif
@@ -101,9 +101,9 @@ diff -ruN vim62./src/feature.h vim62/src/feature.h
  
  /*
   * +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
+diff -burN vim62.orig/src/globals.h vim62/src/globals.h
+--- vim62.orig/src/globals.h	2004-03-01 22:36:43.705629808 +0100
++++ vim62/src/globals.h	2004-03-01 22:43:14.172269856 +0100
 @@ -846,6 +846,9 @@
  #ifdef USE_TERM_CONSOLE
  EXTERN int	term_console INIT(= FALSE); /* set to TRUE when console used */
@@ -114,23 +114,24 @@ diff -ruN vim62./src/globals.h vim62/src/globals.h
  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 -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 */
+diff -burN vim62.orig/src/main.c vim62/src/main.c
+--- vim62.orig/src/main.c	2004-03-01 22:36:43.668635432 +0100
++++ vim62/src/main.c	2004-03-01 22:57:05.472892952 +0100
+@@ -2222,6 +2222,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 -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 @@
+ #endif
+diff -burN vim62.orig/src/Makefile vim62/src/Makefile
+--- vim62.orig/src/Makefile	2004-03-01 22:36:43.325687568 +0100
++++ vim62/src/Makefile	2004-03-01 22:43:16.557907184 +0100
+@@ -1188,6 +1188,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)
  
@@ -153,7 +154,7 @@ diff -ruN vim62./src/Makefile vim62/src/Makefile
  
  ################################################
  ##   no changes required below this line      ##
-@@ -1166,7 +1182,7 @@
+@@ -1198,7 +1214,7 @@
  .SUFFIXES:
  .SUFFIXES: .cc .c .o .pro
  
@@ -162,7 +163,7 @@ diff -ruN vim62./src/Makefile vim62/src/Makefile
  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 @@
+@@ -1280,6 +1296,7 @@
  	screen.c \
  	search.c \
  	syntax.c \
@@ -170,7 +171,7 @@ diff -ruN vim62./src/Makefile vim62/src/Makefile
  	tag.c \
  	term.c \
  	ui.c \
-@@ -1314,6 +1331,7 @@
+@@ -1346,6 +1363,7 @@
  	objects/screen.o \
  	objects/search.o \
  	objects/syntax.o \
@@ -178,7 +179,7 @@ diff -ruN vim62./src/Makefile vim62/src/Makefile
  	$(SNIFF_OBJ) \
  	objects/tag.o \
  	objects/term.o \
-@@ -2252,6 +2270,9 @@
+@@ -2300,6 +2318,9 @@
  objects/undo.o: undo.c
  	$(CCC) -o $@ undo.c
  
@@ -188,7 +189,7 @@ diff -ruN vim62./src/Makefile vim62/src/Makefile
  objects/window.o: window.c
  	$(CCC) -o $@ window.c
  
-@@ -2410,6 +2431,9 @@
+@@ -2533,6 +2554,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
@@ -198,7 +199,7 @@ diff -ruN vim62./src/Makefile vim62/src/Makefile
  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 @@
+@@ -2681,3 +2705,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
@@ -225,9 +226,9 @@ diff -ruN vim62./src/Makefile vim62/src/Makefile
 + 
 +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
+diff -burN vim62.orig/src/normal.c vim62/src/normal.c
+--- vim62.orig/src/normal.c	2004-03-01 22:36:43.334686200 +0100
++++ vim62/src/normal.c	2004-03-01 22:43:16.611898976 +0100
 @@ -84,6 +84,10 @@
  #ifdef FEAT_VISUAL
  static int	get_visual_text __ARGS((cmdarg_T *cap, char_u **pp, int *lenp));
@@ -257,7 +258,7 @@ diff -ruN vim62./src/normal.c vim62/src/normal.c
      {Ctrl_T,	nv_tagpop,	NV_NCW,			0},
      {Ctrl_U,	nv_halfpage,	0,			0},
  #ifdef FEAT_VISUAL
-@@ -7574,6 +7586,28 @@
+@@ -7686,6 +7698,28 @@
  #endif
  }
  
@@ -286,9 +287,9 @@ diff -ruN vim62./src/normal.c vim62/src/normal.c
  #ifdef FEAT_VISUAL
  /*
   * In exclusive Visual mode, may include the last character.
-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
+diff -burN vim62.orig/src/option.c vim62/src/option.c
+--- vim62.orig/src/option.c	2004-03-01 22:36:43.724626920 +0100
++++ vim62/src/option.c	2004-03-01 22:43:16.645893808 +0100
 @@ -121,6 +121,8 @@
      , PV_SW
      , PV_SWF
@@ -309,7 +310,7 @@ diff -ruN vim62./src/option.c vim62/src/option.c
  static long	p_ts;
  static long	p_tw;
  static int	p_tx;
-@@ -1052,7 +1058,7 @@
+@@ -1071,7 +1077,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,
@@ -318,7 +319,7 @@ diff -ruN vim62./src/option.c vim62/src/option.c
  				(char_u *)0L}},
      {"history",	    "hi",   P_NUM|P_VIM,
  			    (char_u *)&p_hi, PV_NONE,
-@@ -1317,6 +1323,13 @@
+@@ -1336,6 +1342,13 @@
  			    (char_u *)NULL, PV_NONE,
  #endif
  			    {(char_u *)"", (char_u *)0L}},
@@ -332,7 +333,7 @@ diff -ruN vim62./src/option.c vim62/src/option.c
      {"laststatus",  "ls",   P_NUM|P_VI_DEF|P_RALL,
  #ifdef FEAT_WINDOWS
  			    (char_u *)&p_ls, PV_NONE,
-@@ -1915,6 +1928,14 @@
+@@ -1934,6 +1947,14 @@
      {"sourceany",   NULL,   P_BOOL|P_VI_DEF,
  			    (char_u *)NULL, PV_NONE,
  			    {(char_u *)FALSE, (char_u *)0L}},
@@ -347,7 +348,7 @@ diff -ruN vim62./src/option.c vim62/src/option.c
      {"splitbelow",  "sb",   P_BOOL|P_VI_DEF,
  #ifdef FEAT_WINDOWS
  			    (char_u *)&p_sb, PV_NONE,
-@@ -4690,6 +4711,26 @@
+@@ -4770,6 +4791,26 @@
  	    errmsg = e_invarg;
      }
  #endif
@@ -374,7 +375,7 @@ diff -ruN vim62./src/option.c vim62/src/option.c
  
  #ifdef FEAT_MBYTE
      /* 'encoding' and 'fileencoding' */
-@@ -7725,6 +7766,10 @@
+@@ -7842,6 +7883,10 @@
  #ifdef FEAT_SYN_HL
  	case PV_SYN:	return (char_u *)&(curbuf->b_p_syn);
  #endif
@@ -385,10 +386,10 @@ diff -ruN vim62./src/option.c vim62/src/option.c
  	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 -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 @@
+diff -burN vim62.orig/src/option.h vim62/src/option.h
+--- vim62.orig/src/option.h	2004-03-01 22:36:43.726626616 +0100
++++ vim62/src/option.h	2004-03-01 22:43:16.649893200 +0100
+@@ -375,6 +375,8 @@
  EXTERN char_u	*p_dex;		/* 'diffexpr' */
  # endif
  #endif
@@ -397,18 +398,18 @@ diff -ruN vim62./src/option.h vim62/src/option.h
  #ifdef FEAT_INS_EXPAND
  EXTERN char_u	*p_dict;	/* 'dictionary' */
  #endif
-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
+diff -burN vim62.orig/src/proto/spell.pro vim62/src/proto/spell.pro
+--- vim62.orig/src/proto/spell.pro	1970-01-01 01:00:00.000000000 +0100
++++ vim62/src/proto/spell.pro	2004-03-01 22:43:16.651892896 +0100
 @@ -0,0 +1,5 @@
 +int  reload_dict(void);
 +void ex_spell(exarg_T *eap);
 +int  get_spell_attr(colnr_T spell_col, colnr_T col, char_u	*line);
 +int  set_to_private_dict(char *line, int cursor_col, int convert_to_lower);
 +void spell_save_private_dict(void);
-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
+diff -burN vim62.orig/src/proto.h vim62/src/proto.h
+--- vim62.orig/src/proto.h	2004-03-01 22:36:43.736625096 +0100
++++ vim62/src/proto.h	2004-03-01 22:43:16.652892744 +0100
 @@ -72,6 +72,9 @@
  #  include "os_qnx.pro"
  # endif
@@ -419,9 +420,9 @@ diff -ruN vim62./src/proto.h vim62/src/proto.h
  # include "buffer.pro"
  # include "charset.pro"
  # ifdef FEAT_CSCOPE
-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
+diff -burN vim62.orig/src/screen.c vim62/src/screen.c
+--- vim62.orig/src/screen.c	2004-03-01 22:36:43.642639384 +0100
++++ vim62/src/screen.c	2004-03-01 22:43:16.681888336 +0100
 @@ -115,6 +115,9 @@
  static match_T match_hl;	/* used for ":match" highlight matching */
  #endif
@@ -432,7 +433,7 @@ diff -ruN vim62./src/screen.c vim62/src/screen.c
  #ifdef FEAT_FOLDING
  static foldinfo_T win_foldinfo;	/* info for 'foldcolumn' */
  #endif
-@@ -2466,6 +2469,9 @@
+@@ -2468,6 +2471,9 @@
      int		has_syntax = FALSE;	/* this buffer has syntax highl. */
      int		save_did_emsg;
  #endif
@@ -442,7 +443,7 @@ diff -ruN vim62./src/screen.c vim62/src/screen.c
      int		extra_check;		/* has syntax or linebreak */
  #ifdef FEAT_MBYTE
      int		multi_attr = 0;		/* attributes desired by multibyte */
-@@ -2544,8 +2550,18 @@
+@@ -2546,8 +2552,18 @@
  #else
      extra_check = 0;
  #endif
@@ -462,7 +463,7 @@ diff -ruN vim62./src/screen.c vim62/src/screen.c
      {
  	/* Prepare for syntax highlighting in this line.  When there is an
  	 * error, stop syntax highlighting. */
-@@ -3196,6 +3212,10 @@
+@@ -3198,6 +3214,10 @@
  	    else if (search_attr == 0 && has_syntax)
  		char_attr = syntax_attr;
  #endif
@@ -473,7 +474,7 @@ diff -ruN vim62./src/screen.c vim62/src/screen.c
  	    else
  		char_attr = search_attr;
  
-@@ -3510,6 +3530,17 @@
+@@ -3512,6 +3532,17 @@
  			char_attr = syntax_attr;
  		}
  #endif
@@ -491,9 +492,9 @@ diff -ruN vim62./src/screen.c vim62/src/screen.c
  #ifdef FEAT_LINEBREAK
  		/*
  		 * Found last space before word: check for line break
-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
+diff -burN vim62.orig/src/spell/config.h vim62/src/spell/config.h
+--- vim62.orig/src/spell/config.h	1970-01-01 01:00:00.000000000 +0100
++++ vim62/src/spell/config.h	2004-03-01 22:43:16.704884840 +0100
 @@ -0,0 +1,846 @@
 +#include "local.h"	/* local definitions for options */
 +
@@ -1341,9 +1342,9 @@ diff -ruN vim62./src/spell/config.h vim62/src/spell/config.h
 +#endif /* COUNTSUFFIX */
 +#define SIGNAL_TYPE_STRING "void"
 +#define MASKTYPE_STRING "long"
-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
+diff -burN vim62.orig/src/spell/good.c vim62/src/spell/good.c
+--- vim62.orig/src/spell/good.c	1970-01-01 01:00:00.000000000 +0100
++++ vim62/src/spell/good.c	2004-03-01 22:43:16.721882256 +0100
 @@ -0,0 +1,400 @@
 +#ifndef lint
 +static char Rcs_Id[] =
@@ -1745,9 +1746,9 @@ diff -ruN vim62./src/spell/good.c vim62/src/spell/good.c
 +    if (sufflag > 0)
 +	(void) putchar (sufflag);
 +}
-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
+diff -burN vim62.orig/src/spell/hash.c vim62/src/spell/hash.c
+--- vim62.orig/src/spell/hash.c	1970-01-01 01:00:00.000000000 +0100
++++ vim62/src/spell/hash.c	2004-03-01 22:43:16.722882104 +0100
 @@ -0,0 +1,91 @@
 +/*
 + * hash.c - a simple hash function for ispell
@@ -1840,9 +1841,9 @@ diff -ruN vim62./src/spell/hash.c vim62/src/spell/hash.c
 +	}
 +    return (unsigned long) h % hashtblsize;
 +}
-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
+diff -burN vim62.orig/src/spell/i_proto.h vim62/src/spell/i_proto.h
+--- vim62.orig/src/spell/i_proto.h	1970-01-01 01:00:00.000000000 +0100
++++ vim62/src/spell/i_proto.h	2004-03-01 22:43:16.724881800 +0100
 @@ -0,0 +1,112 @@
 +Global int	addvheader (struct dent * ent);
 +Global void	askmode (void);
@@ -1956,9 +1957,9 @@ diff -ruN vim62./src/spell/i_proto.h vim62/src/spell/i_proto.h
 +Global int insert(register ichar_t *	word);
 +Global char * linit (char *);
 +Global char * last_slash (char *file);
-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
+diff -burN vim62.orig/src/spell/ispell.h vim62/src/spell/ispell.h
+--- vim62.orig/src/spell/ispell.h	1970-01-01 01:00:00.000000000 +0100
++++ vim62/src/spell/ispell.h	2004-03-01 22:43:16.728881192 +0100
 @@ -0,0 +1,611 @@
 +/*
 + * $Id$
@@ -2571,9 +2572,9 @@ diff -ruN vim62./src/spell/ispell.h vim62/src/spell/ispell.h
 +S_INIT (char LaTeX_Mode, 'P');
 +
 +#include "i_proto.h"
-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
+diff -burN vim62.orig/src/spell/local.h vim62/src/spell/local.h
+--- vim62.orig/src/spell/local.h	1970-01-01 01:00:00.000000000 +0100
++++ vim62/src/spell/local.h	2004-03-01 22:43:16.731880736 +0100
 @@ -0,0 +1,338 @@
 +/*
 + * Written by Eli Zaretskii <eliz@is.elta.co.il>
@@ -2913,9 +2914,9 @@ diff -ruN vim62./src/spell/local.h vim62/src/spell/local.h
 +#define HASHSUFFIX	".hash"
 +#define STATSUFFIX	".sta"
 +#define COUNTSUFFIX	".cnt"
-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
+diff -burN vim62.orig/src/spell/lookup.c vim62/src/spell/lookup.c
+--- vim62.orig/src/spell/lookup.c	1970-01-01 01:00:00.000000000 +0100
++++ vim62/src/spell/lookup.c	2004-03-01 22:43:16.734880280 +0100
 @@ -0,0 +1,534 @@
 +#ifndef lint
 +static char Rcs_Id[] =
@@ -3451,9 +3452,9 @@ diff -ruN vim62./src/spell/lookup.c vim62/src/spell/lookup.c
 +    else
 +	return NULL;
 +}
-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
+diff -burN vim62.orig/src/spell/makedent.c vim62/src/spell/makedent.c
+--- vim62.orig/src/spell/makedent.c	1970-01-01 01:00:00.000000000 +0100
++++ vim62/src/spell/makedent.c	2004-03-01 22:43:16.755877088 +0100
 @@ -0,0 +1,1107 @@
 +/*
 + * Copyright 1988, 1989, 1992, 1993, Geoff Kuenning, Granada Hills, CA
@@ -4562,9 +4563,9 @@ diff -ruN vim62./src/spell/makedent.c vim62/src/spell/makedent.c
 +       }
 +    return(NULL);
 +}
-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
+diff -burN vim62.orig/src/spell/msgs.h vim62/src/spell/msgs.h
+--- vim62.orig/src/spell/msgs.h	1970-01-01 01:00:00.000000000 +0100
++++ vim62/src/spell/msgs.h	2004-03-01 22:43:16.758876632 +0100
 @@ -0,0 +1,278 @@
 +/*
 + * $Id$
@@ -4844,9 +4845,9 @@ diff -ruN vim62./src/spell/msgs.h vim62/src/spell/msgs.h
 + */
 +#define UNSQ_C_BAD_COUNT	"Illegal count character 0x%x\n"
 +#define UNSQ_C_SURPRISE_EOF	"Unexpected EOF\n"
-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
+diff -burN vim62.orig/src/spell/tgood.c vim62/src/spell/tgood.c
+--- vim62.orig/src/spell/tgood.c	1970-01-01 01:00:00.000000000 +0100
++++ vim62/src/spell/tgood.c	2004-03-01 22:43:16.762876024 +0100
 @@ -0,0 +1,654 @@
 +/*
 + * Copyright 1987, 1988, 1989, 1992, 1993, Geoff Kuenning, Granada Hills, CA
@@ -5502,9 +5503,9 @@ diff -ruN vim62./src/spell/tgood.c vim62/src/spell/tgood.c
 +    for (  ;  --len >= 0;  dst++)
 +	*dst = mytolower (*dst);
 +    }
-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
+diff -burN vim62.orig/src/spell/tree.c vim62/src/spell/tree.c
+--- vim62.orig/src/spell/tree.c	1970-01-01 01:00:00.000000000 +0100
++++ vim62/src/spell/tree.c	2004-03-01 22:43:16.766875416 +0100
 @@ -0,0 +1,748 @@
 +/*
 + * tree.c - a hash style dictionary for user's personal words
@@ -6254,9 +6255,9 @@ diff -ruN vim62./src/spell/tree.c vim62/src/spell/tree.c
 +    return NULL;
 +}
 +#endif /* REGEX_LOOKUP */
-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
+diff -burN vim62.orig/src/spell/util.c vim62/src/spell/util.c
+--- vim62.orig/src/spell/util.c	1970-01-01 01:00:00.000000000 +0100
++++ vim62/src/spell/util.c	2004-03-01 22:43:16.768875112 +0100
 @@ -0,0 +1,351 @@
 +#include <ctype.h>
 +#include "ispell.h"
@@ -6609,9 +6610,9 @@ diff -ruN vim62./src/spell/util.c vim62/src/spell/util.c
 +       }
 +    return(NULL);
 +}
-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
+diff -burN vim62.orig/src/spell/version.h vim62/src/spell/version.h
+--- vim62.orig/src/spell/version.h	1970-01-01 01:00:00.000000000 +0100
++++ vim62/src/spell/version.h	2004-03-01 22:43:16.770874808 +0100
 @@ -0,0 +1,124 @@
 +/*
 + * Since the strings in this file are printed out when the "-v" switch is
@@ -6737,9 +6738,9 @@ diff -ruN vim62./src/spell/version.h vim62/src/spell/version.h
 + * Get rid of all old RCS log lines in preparation for the 3.1 release.
 + *
 + */
-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
+diff -burN vim62.orig/src/spell/wm.h vim62/src/spell/wm.h
+--- vim62.orig/src/spell/wm.h	1970-01-01 01:00:00.000000000 +0100
++++ vim62/src/spell/wm.h	2004-03-01 22:43:16.770874808 +0100
 @@ -0,0 +1,12 @@
 +#ifndef Public
 +enum _logical {False,True};
@@ -6753,9 +6754,9 @@ diff -ruN vim62./src/spell/wm.h vim62/src/spell/wm.h
 +#define Public 
 +#define Local static
 +#endif
-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
+diff -burN vim62.orig/src/spell.c vim62/src/spell.c
+--- vim62.orig/src/spell.c	1970-01-01 01:00:00.000000000 +0100
++++ vim62/src/spell.c	2004-03-01 22:43:16.772874504 +0100
 @@ -0,0 +1,183 @@
 +#include "spell/wm.h"
 +#include "vim.h"
@@ -6940,10 +6941,10 @@ diff -ruN vim62./src/spell.c vim62/src/spell.c
 +	treeoutput ();
 +}
 +#endif
-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 @@
+diff -burN vim62.orig/src/syntax.c vim62/src/syntax.c
+--- vim62.orig/src/syntax.c	2004-03-01 22:36:43.675634368 +0100
++++ vim62/src/syntax.c	2004-03-01 22:43:16.806869336 +0100
+@@ -5921,6 +5921,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",
@@ -6953,7 +6954,7 @@ diff -ruN vim62./src/syntax.c vim62/src/syntax.c
  	"DiffText term=reverse cterm=bold ctermbg=Red gui=bold guibg=Red",
  	NULL
      };
-@@ -5906,6 +5909,9 @@
+@@ -5940,6 +5943,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",
@@ -6963,7 +6964,7 @@ diff -ruN vim62./src/syntax.c vim62/src/syntax.c
  	"DiffChange term=bold ctermbg=LightMagenta guibg=LightMagenta",
  	"DiffDelete term=bold ctermfg=Blue ctermbg=LightCyan gui=bold guifg=Blue guibg=LightCyan",
  	NULL
-@@ -5926,6 +5932,9 @@
+@@ -5960,6 +5966,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",
@@ -6973,9 +6974,9 @@ diff -ruN vim62./src/syntax.c vim62/src/syntax.c
  	"DiffChange term=bold ctermbg=DarkMagenta guibg=DarkMagenta",
  	"DiffDelete term=bold ctermfg=Blue ctermbg=DarkCyan gui=bold guifg=Blue guibg=DarkCyan",
  	NULL
-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
+diff -burN vim62.orig/src/version.c vim62/src/version.c
+--- vim62.orig/src/version.c	2004-03-01 22:36:43.728626312 +0100
++++ vim62/src/version.c	2004-03-01 22:43:16.810868728 +0100
 @@ -470,6 +470,11 @@
  #else
  	"-syntax",
@@ -6988,7 +6989,7 @@ diff -ruN vim62./src/version.c vim62/src/version.c
  	    /* only interesting on Unix systems */
  #if defined(USE_SYSTEM) && (defined(UNIX) || defined(__EMX__))
  	"+system()",
-@@ -1103,7 +1108,7 @@
+@@ -1729,7 +1734,7 @@
      int		add_version;
      int		attr;
  {
@@ -6997,9 +6998,9 @@ diff -ruN vim62./src/version.c vim62/src/version.c
      int		col;
      char_u	*p;
      int		l;
-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
+diff -burN vim62.orig/src/version.h vim62/src/version.h
+--- vim62.orig/src/version.h	2004-03-01 22:36:43.728626312 +0100
++++ vim62/src/version.h	2004-03-01 22:43:16.812868424 +0100
 @@ -35,6 +35,10 @@
   */
  #define VIM_VERSION_NODOT	"vim62"
@@ -7011,10 +7012,10 @@ diff -ruN vim62./src/version.h vim62/src/version.h
 +#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 @@
+diff -burN vim62.orig/src/vim.h vim62/src/vim.h
+--- vim62.orig/src/vim.h	2004-03-01 22:36:43.367681184 +0100
++++ vim62/src/vim.h	2004-03-01 22:43:16.815867968 +0100
+@@ -1068,13 +1068,14 @@
      , HLF_CHD	    /* Changed diff line */
      , HLF_DED	    /* Deleted diff line */
      , HLF_TXD	    /* Text Changed in diff line */
-- 
2.44.0