summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2009-02-21 23:59:19 +0000
committerBram Moolenaar <Bram@vim.org>2009-02-21 23:59:19 +0000
commit2a9e4df9fbdafd4386f0d6eff7e40a57f322b071 (patch)
treee097187a4154bab8a401d9cc7dbbcb22a358e539 /src
parentbb9c7d1cc537369bfd3098dd7a499aadbc648673 (diff)
downloadvim-git-2a9e4df9fbdafd4386f0d6eff7e40a57f322b071.tar.gz
updated for version 7.2-118v7.2.118
Diffstat (limited to 'src')
-rw-r--r--src/message.c5
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 2 deletions
diff --git a/src/message.c b/src/message.c
index e0f289760..66bab9e92 100644
--- a/src/message.c
+++ b/src/message.c
@@ -976,7 +976,7 @@ wait_return(redraw)
}
}
else if (msg_scrolled > Rows - 2
- && (c == 'j' || c == K_DOWN || c == 'd'))
+ && (c == 'j' || c == K_DOWN || c == 'd' || c == 'f'))
c = K_IGNORE;
}
} while ((had_got_int && c == Ctrl_C)
@@ -2504,7 +2504,6 @@ do_more_prompt(typed_char)
break;
case 'u': /* Up half a page */
- case K_PAGEUP:
scroll = -(Rows / 2);
break;
@@ -2513,10 +2512,12 @@ do_more_prompt(typed_char)
break;
case 'b': /* one page back */
+ case K_PAGEUP:
scroll = -(Rows - 1);
break;
case ' ': /* one extra page */
+ case 'f':
case K_PAGEDOWN:
case K_LEFTMOUSE:
scroll = Rows - 1;
diff --git a/src/version.c b/src/version.c
index 1e5d6f6b1..1f5165ccf 100644
--- a/src/version.c
+++ b/src/version.c
@@ -677,6 +677,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 118,
+/**/
117,
/**/
116,