diff options
| author | Bram Moolenaar <Bram@vim.org> | 2006-09-03 14:35:42 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2006-09-03 14:35:42 +0000 |
| commit | 203335e4a9a4fb4c2d034fe950bdb12043b93f6e (patch) | |
| tree | b238996b248534a2ac12e57fd6eaf1ca8aaa9719 | |
| parent | ac48dbff439c030430e743cd97c914bcc3443270 (diff) | |
| download | vim-git-203335e4a9a4fb4c2d034fe950bdb12043b93f6e.tar.gz | |
updated for version 7.0-083v7.0.083
| -rw-r--r-- | src/message.c | 3 | ||||
| -rw-r--r-- | src/misc1.c | 10 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 8 insertions, 7 deletions
diff --git a/src/message.c b/src/message.c index 8f0a9c632..eebb6db2e 100644 --- a/src/message.c +++ b/src/message.c @@ -1925,7 +1925,8 @@ msg_puts_display(str, maxlen, attr, recurse) * If screen is completely filled and 'more' is set then wait * for a character. */ - if (p_more && --lines_left == 0 && State != HITRETURN + --lines_left; + if (p_more && lines_left == 0 && State != HITRETURN && !msg_no_more && !exmode_active) { #ifdef FEAT_CON_DIALOG diff --git a/src/misc1.c b/src/misc1.c index e2efcfbe1..78caa2081 100644 --- a/src/misc1.c +++ b/src/misc1.c @@ -3196,14 +3196,12 @@ prompt_for_number(mouse_used) else MSG_PUTS(_("Choice number (<Enter> cancels): ")); - /* Set the state such that text can be selected/copied/pasted. */ + /* Set the state such that text can be selected/copied/pasted and we still + * get mouse events. */ save_cmdline_row = cmdline_row; - cmdline_row = Rows - 1; + cmdline_row = 0; save_State = State; - if (mouse_used == NULL) - State = CMDLINE; - else - State = NORMAL; + State = CMDLINE; i = get_number(TRUE, mouse_used); if (KeyTyped) diff --git a/src/version.c b/src/version.c index 09ec9d5a3..aeab51e4e 100644 --- a/src/version.c +++ b/src/version.c @@ -667,6 +667,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 83, +/**/ 82, /**/ 81, |