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
#ifdef FEAT_INS_EXPAND
EXTERN char_u *p_dict; /* 'dictionary' */
#endif
-diff -Nur vim60am.old/src/os_msdos.c vim60am/src/os_msdos.c
---- vim60am.old/src/os_msdos.c Wed Jul 4 20:42:09 2001
-+++ vim60am/src/os_msdos.c Tue Jul 3 18:39:48 2001
-@@ -78,7 +78,7 @@
- */
-
- unsigned long S_ulScreenBase = 0xb8000;
--unsigned short S_uiAttribute = 0;
-+unsigned short S_uiAttribute = 7 << 8;
- int S_iCurrentRow = 0; /* These are 0 offset */
- int S_iCurrentColumn = 0;
- int S_iLeft = 0; /* Scroll window; these are 1 offset */
-@@ -248,6 +248,9 @@
- }
- else
- {
-+ if(iChar == ' ')
-+ uiValue = ((S_uiAttribute & 0xf700) | 0x700) | ' ';
-+ else
- uiValue = S_uiAttribute | (unsigned char)iChar;
-
- /*
-@@ -309,6 +312,7 @@
- mytextattr(int iAttribute)
- {
- S_uiAttribute = (unsigned short)iAttribute << 8;
-+ textattr(iAttribute); /* for delline() etc */
- }
-
- static void
-@@ -322,6 +326,7 @@
- {
- S_uiAttribute = (unsigned short)((S_uiAttribute & 0xf000)
- | (unsigned short)iTextColor << 8);
-+ textattr(S_uiAttribute >> 8); /* for delline() etc */
- }
-
- static void
-@@ -329,6 +334,7 @@
- {
- S_uiAttribute = (unsigned short)((S_uiAttribute & 0x0f00)
- | (unsigned short)(iBkgColor << 12));
-+ textattr(S_uiAttribute >> 8); /* for delline() etc */
- }
- /*
- * Getdigits: Get a number from a string and skip over it.
-@@ -470,6 +476,7 @@
- static union REGS regs;
- static int saved = FALSE;
-
-+ return; /* WM */
- if (restore)
- {
- if (saved)
-@@ -495,6 +502,7 @@
- mch_set_cursor_shape(int thickness)
- {
- union REGS regs;
-+ return; /* WM */
-
- regs.h.ch = 7 - thickness; /*Starting Line*/
- regs.h.cl = 7; /*Ending Line*/
-@@ -508,6 +516,7 @@
- int idx;
- int thickness;
-
-+ return; /* WM */
- /*
- * How the cursor is drawn depends on the current mode.
- */
-@@ -2226,6 +2235,7 @@
- char *
- djgpp_setlocale(void)
- {
-+ char *country;
- __dpmi_regs regs;
- struct { char id; unsigned short off, seg; } __attribute__ ((packed)) info;
- unsigned char buffer[0x82], lower, upper;
-@@ -2267,6 +2277,127 @@
- __dj_ctype_tolower[upper+1] = lower;
- }
- }
-+ if ((country = getenv("COUNTRY")) != NULL)
-+ {
-+ if(!strcmp(country, "MAZOWIA"))
-+ {
-+ __dj_ctype_flags[(unsigned char)'\86' + 1] = LOCASE;
-+ __dj_ctype_flags[(unsigned char)'\8f' + 1] = UPCASE;
-+ __dj_ctype_flags[(unsigned char)'\8d' + 1] = LOCASE;
-+ __dj_ctype_flags[(unsigned char)'\95' + 1] = UPCASE;
-+ __dj_ctype_flags[(unsigned char)'\91' + 1] = LOCASE;
-+ __dj_ctype_flags[(unsigned char)'\90' + 1] = UPCASE;
-+ __dj_ctype_flags[(unsigned char)'\92' + 1] = LOCASE;
-+ __dj_ctype_flags[(unsigned char)'\9c' + 1] = UPCASE;
-+ __dj_ctype_flags[(unsigned char)'¤' + 1] = LOCASE;
-+ __dj_ctype_flags[(unsigned char)'¥' + 1] = UPCASE;
-+ __dj_ctype_flags[(unsigned char)'¢' + 1] = LOCASE;
-+ __dj_ctype_flags[(unsigned char)'£' + 1] = UPCASE;
-+ __dj_ctype_flags[(unsigned char)'\9e' + 1] = LOCASE;
-+ __dj_ctype_flags[(unsigned char)'\98' + 1] = UPCASE;
-+ __dj_ctype_flags[(unsigned char)'¦' + 1] = LOCASE;
-+ __dj_ctype_flags[(unsigned char)' ' + 1] = UPCASE;
-+ __dj_ctype_flags[(unsigned char)'§' + 1] = LOCASE;
-+ __dj_ctype_flags[(unsigned char)'¡' + 1] = UPCASE;
-+
-+ __dj_ctype_toupper[(unsigned char)'\86'+ 1] = (unsigned char)'\8f';
-+ __dj_ctype_toupper[(unsigned char)'\8f'+ 1] = (unsigned char)'\8f';
-+ __dj_ctype_toupper[(unsigned char)'\8d'+ 1] = (unsigned char)'\95';
-+ __dj_ctype_toupper[(unsigned char)'\95'+ 1] = (unsigned char)'\95';
-+ __dj_ctype_toupper[(unsigned char)'\91'+ 1] = (unsigned char)'\90';
-+ __dj_ctype_toupper[(unsigned char)'\90'+ 1] = (unsigned char)'\90';
-+ __dj_ctype_toupper[(unsigned char)'\92'+ 1] = (unsigned char)'\9c';
-+ __dj_ctype_toupper[(unsigned char)'\9c'+ 1] = (unsigned char)'\9c';
-+ __dj_ctype_toupper[(unsigned char)'¤'+ 1] = (unsigned char)'¥';
-+ __dj_ctype_toupper[(unsigned char)'¥'+ 1] = (unsigned char)'¥';
-+ __dj_ctype_toupper[(unsigned char)'¢'+ 1] = (unsigned char)'£';
-+ __dj_ctype_toupper[(unsigned char)'£'+ 1] = (unsigned char)'£';
-+ __dj_ctype_toupper[(unsigned char)'\9e'+ 1] = (unsigned char)'\98';
-+ __dj_ctype_toupper[(unsigned char)'\98'+ 1] = (unsigned char)'\98';
-+ __dj_ctype_toupper[(unsigned char)'¦'+ 1] = (unsigned char)' ';
-+ __dj_ctype_toupper[(unsigned char)' '+ 1] = (unsigned char)' ';
-+ __dj_ctype_toupper[(unsigned char)'§'+ 1] = (unsigned char)'¡';
-+ __dj_ctype_toupper[(unsigned char)'¡'+ 1] = (unsigned char)'¡';
-+
-+ __dj_ctype_tolower[(unsigned char)'\86'+ 1] = (unsigned char)'\86';
-+ __dj_ctype_tolower[(unsigned char)'\8f'+ 1] = (unsigned char)'\86';
-+ __dj_ctype_tolower[(unsigned char)'\8d'+ 1] = (unsigned char)'\8d';
-+ __dj_ctype_tolower[(unsigned char)'\95'+ 1] = (unsigned char)'\8d';
-+ __dj_ctype_tolower[(unsigned char)'\91'+ 1] = (unsigned char)'\91';
-+ __dj_ctype_tolower[(unsigned char)'\90'+ 1] = (unsigned char)'\91';
-+ __dj_ctype_tolower[(unsigned char)'\92'+ 1] = (unsigned char)'\92';
-+ __dj_ctype_tolower[(unsigned char)'\9c'+ 1] = (unsigned char)'\92';
-+ __dj_ctype_tolower[(unsigned char)'¤'+ 1] = (unsigned char)'¤';
-+ __dj_ctype_tolower[(unsigned char)'¥'+ 1] = (unsigned char)'¤';
-+ __dj_ctype_tolower[(unsigned char)'¢'+ 1] = (unsigned char)'¢';
-+ __dj_ctype_tolower[(unsigned char)'£'+ 1] = (unsigned char)'¢';
-+ __dj_ctype_tolower[(unsigned char)'\9e'+ 1] = (unsigned char)'\9e';
-+ __dj_ctype_tolower[(unsigned char)'\98'+ 1] = (unsigned char)'\9e';
-+ __dj_ctype_tolower[(unsigned char)'¦'+ 1] = (unsigned char)'¦';
-+ __dj_ctype_tolower[(unsigned char)' '+ 1] = (unsigned char)'¦';
-+ __dj_ctype_tolower[(unsigned char)'§'+ 1] = (unsigned char)'§';
-+ __dj_ctype_tolower[(unsigned char)'¡'+ 1] = (unsigned char)'§';
-+ }
-+ else if(!strcmp(country, "CP1250"))
-+ {
-+ __dj_ctype_flags[(unsigned char)'9' + 1] = LOCASE;
-+ __dj_ctype_flags[(unsigned char)'%' + 1] = UPCASE;
-+ __dj_ctype_flags[(unsigned char)'f' + 1] = LOCASE;
-+ __dj_ctype_flags[(unsigned char)'F' + 1] = UPCASE;
-+ __dj_ctype_flags[(unsigned char)'j' + 1] = LOCASE;
-+ __dj_ctype_flags[(unsigned char)'J' + 1] = UPCASE;
-+ __dj_ctype_flags[(unsigned char)'3' + 1] = LOCASE;
-+ __dj_ctype_flags[(unsigned char)'#' + 1] = UPCASE;
-+ __dj_ctype_flags[(unsigned char)'q' + 1] = LOCASE;
-+ __dj_ctype_flags[(unsigned char)'Q' + 1] = UPCASE;
-+ __dj_ctype_flags[(unsigned char)'s' + 1] = LOCASE;
-+ __dj_ctype_flags[(unsigned char)'S' + 1] = UPCASE;
-+ __dj_ctype_flags[(unsigned char)'\1c' + 1] = LOCASE;
-+ __dj_ctype_flags[(unsigned char)'\f' + 1] = UPCASE;
-+ __dj_ctype_flags[(unsigned char)'\1f' + 1] = LOCASE;
-+ __dj_ctype_flags[(unsigned char)'\ f' + 1] = UPCASE;
-+ __dj_ctype_flags[(unsigned char)'?' + 1] = LOCASE;
-+ __dj_ctype_flags[(unsigned char)'/' + 1] = UPCASE;
-+
-+ __dj_ctype_toupper[(unsigned char)'9'+ 1] = (unsigned char)'%';
-+ __dj_ctype_toupper[(unsigned char)'%'+ 1] = (unsigned char)'%';
-+ __dj_ctype_toupper[(unsigned char)'f'+ 1] = (unsigned char)'F';
-+ __dj_ctype_toupper[(unsigned char)'F'+ 1] = (unsigned char)'F';
-+ __dj_ctype_toupper[(unsigned char)'j'+ 1] = (unsigned char)'J';
-+ __dj_ctype_toupper[(unsigned char)'J'+ 1] = (unsigned char)'J';
-+ __dj_ctype_toupper[(unsigned char)'3'+ 1] = (unsigned char)'#';
-+ __dj_ctype_toupper[(unsigned char)'#'+ 1] = (unsigned char)'#';
-+ __dj_ctype_toupper[(unsigned char)'q'+ 1] = (unsigned char)'Q';
-+ __dj_ctype_toupper[(unsigned char)'Q'+ 1] = (unsigned char)'Q';
-+ __dj_ctype_toupper[(unsigned char)'s'+ 1] = (unsigned char)'S';
-+ __dj_ctype_toupper[(unsigned char)'S'+ 1] = (unsigned char)'S';
-+ __dj_ctype_toupper[(unsigned char)'\1c'+ 1] = (unsigned char)'\f';
-+ __dj_ctype_toupper[(unsigned char)'\f'+ 1] = (unsigned char)'\f';
-+ __dj_ctype_toupper[(unsigned char)'\1f'+ 1] = (unsigned char)'\ f';
-+ __dj_ctype_toupper[(unsigned char)'\ f'+ 1] = (unsigned char)'\ f';
-+ __dj_ctype_toupper[(unsigned char)'?'+ 1] = (unsigned char)'/';
-+ __dj_ctype_toupper[(unsigned char)'/'+ 1] = (unsigned char)'/';
-+
-+ __dj_ctype_tolower[(unsigned char)'9'+ 1] = (unsigned char)'9';
-+ __dj_ctype_tolower[(unsigned char)'%'+ 1] = (unsigned char)'9';
-+ __dj_ctype_tolower[(unsigned char)'f'+ 1] = (unsigned char)'f';
-+ __dj_ctype_tolower[(unsigned char)'F'+ 1] = (unsigned char)'f';
-+ __dj_ctype_tolower[(unsigned char)'j'+ 1] = (unsigned char)'j';
-+ __dj_ctype_tolower[(unsigned char)'J'+ 1] = (unsigned char)'j';
-+ __dj_ctype_tolower[(unsigned char)'3'+ 1] = (unsigned char)'3';
-+ __dj_ctype_tolower[(unsigned char)'#'+ 1] = (unsigned char)'3';
-+ __dj_ctype_tolower[(unsigned char)'q'+ 1] = (unsigned char)'q';
-+ __dj_ctype_tolower[(unsigned char)'Q'+ 1] = (unsigned char)'q';
-+ __dj_ctype_tolower[(unsigned char)'s'+ 1] = (unsigned char)'s';
-+ __dj_ctype_tolower[(unsigned char)'S'+ 1] = (unsigned char)'s';
-+ __dj_ctype_tolower[(unsigned char)'\1c'+ 1] = (unsigned char)'\1c';
-+ __dj_ctype_tolower[(unsigned char)'\f'+ 1] = (unsigned char)'\1c';
-+ __dj_ctype_tolower[(unsigned char)'\1f'+ 1] = (unsigned char)'\1f';
-+ __dj_ctype_tolower[(unsigned char)'\ f'+ 1] = (unsigned char)'\1f';
-+ __dj_ctype_tolower[(unsigned char)'?'+ 1] = (unsigned char)'?';
-+ __dj_ctype_tolower[(unsigned char)'/'+ 1] = (unsigned char)'?';
-+ }
-+ }
-
- return "C";
- }
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
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
+** Prefix part of default private dictionary. Under MS-DOS 8.3
+** filename limitation, we are in trouble...
+*/
-+#define DEFPDICT ".isp."
++#define DEFPDICT ".ispell_"
+
+/* old place to look for default word list */
+#define OLDPDICT ".isp."
+/*
+** 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"
+++ vim60am/src/version.h Tue Jul 3 19:04:36 2001
@@ -33,6 +33,10 @@
*/
- #define VIM_VERSION_NODOT "vim60ar"
- #define VIM_VERSION_SHORT "6.0ar"
+ #define VIM_VERSION_NODOT "vim60"
+ #define VIM_VERSION_SHORT "6.0"
+#ifdef FEAT_SPELL_HL
-+#define VIM_VERSION_MEDIUM "6.0ar BETA + ispell 3.1.20 WM-3"
++#define VIM_VERSION_MEDIUM "6.0 + ispell 3.1.20 WM-3"
+#else
- #define VIM_VERSION_MEDIUM "6.0ar BETA"
+ #define VIM_VERSION_MEDIUM "6.0"
+#endif
- #define VIM_VERSION_LONG "VIM - Vi IMproved 6.0ar BETA (2001 Aug 12)"
- #define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 6.0ar BETA (2001 Aug 12, compiled "
+ #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
projects / packages / vim.git / blobdiff