X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=vim-ispell.patch;h=baa00def99b9b51396dac036e41f6ed5a1e9ac94;hb=80b161c5839a657b98f62d1c487f034a1851e40f;hp=24d80803304390cd3a0fd52846365a4f44340356;hpb=310b65f394ddd96bd14688c6607342bd12f1be66;p=packages%2Fvim.git

diff --git a/vim-ispell.patch b/vim-ispell.patch
index 24d8080..baa00de 100644
--- a/vim-ispell.patch
+++ b/vim-ispell.patch
@@ -133,18 +133,18 @@ diff -Nur vim60am.old/src/edit.c vim60am/src/edit.c
  
  	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
+diff -ur vim60/src/ex_cmds.h vim60-/src/ex_cmds.h
+--- vim60/src/ex_cmds.h	Sat Sep  8 20:20:22 2001
++++ vim60-/src/ex_cmds.h	Sun Feb 17 21:06:53 2002
 @@ -700,6 +700,8 @@
- 			RANGE|WHOLEFOLD|EXTRA|CMDWIN|MODIFY),
- EX(CMD_source,		"source",	ex_source,
  			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,
+ 			EXTRA|RANGE|NOTADR|COUNT|BANG|EDITCMD|ARGOPT|TRLBAR),
+ EX(CMD_srewind,		"srewind",	ex_rewind,
 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
@@ -461,22 +461,24 @@ diff -Nur vim60am.old/src/screen.c vim60am/src/screen.c
  	    else
  		char_attr = search_attr;
  
-@@ -3238,6 +3258,15 @@
- 
- 		    if (area_attr == 0 && search_attr == 0)
+@@ -3320,6 +3340,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
+ 		/*
+ 		 * Found last space before word: check for line break
 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
@@ -2887,9 +2889,9 @@ diff -Nur vim60am.old/src/spell/local.h vim60am/src/spell/local.h
 +/*
 +** Environment variable to use to locate the home directory.  On DOS
 +** systems we set this to ISPELL_HOME to avoid conflicts with
-+** other programs that look for a HOME environment variable.
++** other programs that look for a HOME environment variable. We're not on DOS.
 +*/
-+#define HOME              "ISPELL_HOME"
++#define HOME              "HOME"
 +#define PDICTHOME         "."
 +#define OPTIONVAR         "ISPELL_OPTIONS"
 +#define LIBRARYVAR        "ISPELL_DICTDIR"