summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2005-09-16 21:47:57 +0000
committerBram Moolenaar <Bram@vim.org>2005-09-16 21:47:57 +0000
commit6b730e111c329caccbb16f08c5b6bbc41d3b5690 (patch)
treeda7ce9db19f11624913c41b8d68002ad1c301c4d /src
parent58071af793eee8eaaf4d3e60ddf652227bfe79c3 (diff)
updated for version 7.0148
Diffstat (limited to 'src')
-rw-r--r--src/normal.c4
-rw-r--r--src/spell.c7
2 files changed, 6 insertions, 5 deletions
diff --git a/src/normal.c b/src/normal.c
index 12d4ffc8f6..84de270ea4 100644
--- a/src/normal.c
+++ b/src/normal.c
@@ -5834,10 +5834,6 @@ nv_csearch(cap)
t_cmd = FALSE;
cap->oap->motion_type = MCHAR;
- if (cap->arg == BACKWARD)
- cap->oap->inclusive = FALSE;
- else
- cap->oap->inclusive = TRUE;
if (IS_SPECIAL(cap->nchar) || searchc(cap, t_cmd) == FAIL)
clearopbeep(cap->oap);
else
diff --git a/src/spell.c b/src/spell.c
index 8f8c8929ce..2562e4b8ba 100644
--- a/src/spell.c
+++ b/src/spell.c
@@ -11293,6 +11293,7 @@ sug_compare __ARGS((const void *s1, const void *s2));
/*
* Function given to qsort() to sort the suggestions on st_score.
+ * First on "st_score", then "st_altscore" then alphabetically.
*/
static int
#ifdef __BORLANDC__
@@ -11307,7 +11308,11 @@ sug_compare(s1, s2)
int n = p1->st_score - p2->st_score;
if (n == 0)
- return p1->st_altscore - p2->st_altscore;
+ {
+ n = p1->st_altscore - p2->st_altscore;
+ if (n == 0)
+ n = STRICMP(p1->st_word, p2->st_word);
+ }
return n;
}