summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2005-12-10 20:15:02 +0000
committerBram Moolenaar <Bram@vim.org>2005-12-10 20:15:02 +0000
commit43abc52195744330e1df8f50bda64c1f66f9b507 (patch)
tree1bbc1276d144babb5eb97ab49b495f08b4b96d39 /src
parentba930509b084cd5eb1c74a23ab1b9f489d5ba064 (diff)
updated for version 7.0166
Diffstat (limited to 'src')
-rw-r--r--src/normal.c3
-rw-r--r--src/os_mac.h4
-rw-r--r--src/spell.c16
3 files changed, 7 insertions, 16 deletions
diff --git a/src/normal.c b/src/normal.c
index c8e847a0e1..71eefc4942 100644
--- a/src/normal.c
+++ b/src/normal.c
@@ -4766,7 +4766,7 @@ dozet:
}
break;
- case '?': /* "z?": suggestions for a badly spelled word */
+ case '=': /* "z=": suggestions for a badly spelled word */
if (!checkclearopq(cap->oap))
spell_suggest((int)cap->count0);
break;
@@ -8799,4 +8799,3 @@ nv_cursorhold(cap)
cap->retval |= CA_COMMAND_BUSY; /* don't call edit() now */
}
#endif
-
diff --git a/src/os_mac.h b/src/os_mac.h
index 0641991d69..5e286594fb 100644
--- a/src/os_mac.h
+++ b/src/os_mac.h
@@ -144,8 +144,8 @@
comment */
-#undef USE_FNAME_CASE /* TODO: make :e os_Mac.c, :w, save back the
- file as os_mac.c */
+#define USE_FNAME_CASE /* make ":e os_Mac.c" open the file in its
+ original case, as "os_mac.c" */
#define BINARY_FILE_IO
#define EOL_DEFAULT EOL_MAC
#ifndef MACOS_X_UNIX /* I hope that switching these two lines */
diff --git a/src/spell.c b/src/spell.c
index f57ff0c173..c3f46986bc 100644
--- a/src/spell.c
+++ b/src/spell.c
@@ -851,28 +851,20 @@ spell_check(wp, ptr, attrp, capcol)
vim_memset(&mi, 0, sizeof(matchinf_T));
/* A number is always OK. Also skip hexadecimal numbers 0xFF99 and
- * 0X99FF. But when a word character follows do check spelling to find
- * "3GPP". */
+ * 0X99FF. But always do check spelling to find "3GPP" and "11
+ * julifeest". */
if (*ptr >= '0' && *ptr <= '9')
{
if (*ptr == '0' && (ptr[1] == 'x' || ptr[1] == 'X'))
mi.mi_end = skiphex(ptr + 2);
else
- {
mi.mi_end = skipdigits(ptr);
- nrlen = mi.mi_end - ptr;
- }
- if (!spell_iswordp(mi.mi_end, wp->w_buffer))
- return (int)(mi.mi_end - ptr);
-
- /* Try including the digits in the word. */
- mi.mi_fend = ptr + nrlen;
+ nrlen = mi.mi_end - ptr;
}
- else
- mi.mi_fend = ptr;
/* Find the normal end of the word (until the next non-word character). */
mi.mi_word = ptr;
+ mi.mi_fend = ptr;
if (spell_iswordp(mi.mi_fend, wp->w_buffer))
{
do