summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2013-04-15 15:47:12 +0200
committerBram Moolenaar <Bram@vim.org>2013-04-15 15:47:12 +0200
commit687a29c5e26b2fa69f3b2cb3504d1fd2f090daf7 (patch)
tree2a4f11718612502ad2da0decb8d36b1e8cf1c3f0
parentf6dcbb245b3d808a5d812ac66ce6ca701b1991f2 (diff)
updated for version 7.3.901v7.3.901
Problem: Outdated comment, ugly condition. Solution: Update a few comments, break line.
-rw-r--r--src/getchar.c2
-rw-r--r--src/misc1.c1
-rw-r--r--src/undo.c6
-rw-r--r--src/version.c2
4 files changed, 7 insertions, 4 deletions
diff --git a/src/getchar.c b/src/getchar.c
index d3d50e9254..ba034bf2e8 100644
--- a/src/getchar.c
+++ b/src/getchar.c
@@ -444,7 +444,7 @@ flush_buffers(flush_typeahead)
typebuf.tb_off = MAXMAPLEN;
typebuf.tb_len = 0;
}
- else /* remove mapped characters only */
+ else /* remove mapped characters at the start only */
{
typebuf.tb_off += typebuf.tb_maplen;
typebuf.tb_len -= typebuf.tb_maplen;
diff --git a/src/misc1.c b/src/misc1.c
index 7c2d350524..96d268d49d 100644
--- a/src/misc1.c
+++ b/src/misc1.c
@@ -5054,7 +5054,6 @@ vim_fnamencmp(x, y, len)
int cx = NUL;
int cy = NUL;
- /* TODO: multi-byte characters. */
while (len > 0)
{
cx = PTR2CHAR(px);
diff --git a/src/undo.c b/src/undo.c
index db81ba0cd2..ba6ab379f0 100644
--- a/src/undo.c
+++ b/src/undo.c
@@ -216,6 +216,7 @@ u_check(int newhead_may_be_NULL)
/*
* Save the current line for both the "u" and "U" command.
+ * Careful: may trigger autocommands that reload the buffer.
* Returns OK or FAIL.
*/
int
@@ -238,8 +239,9 @@ u_save(top, bot)
if (undo_off)
return OK;
- if (top > curbuf->b_ml.ml_line_count ||
- top >= bot || bot > curbuf->b_ml.ml_line_count + 1)
+ if (top > curbuf->b_ml.ml_line_count
+ || top >= bot
+ || bot > curbuf->b_ml.ml_line_count + 1)
return FALSE; /* rely on caller to do error messages */
if (top + 2 == bot)
diff --git a/src/version.c b/src/version.c
index 9884bf9129..f117830b68 100644
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 901,
+/**/
900,
/**/
899,