updated for version 7.0-083

diff --git a/src/message.c b/src/message.c
index 8f0a9c6320584b48cfc286b5c7d66ab6d6077f8f..eebb6db2ec759d4cf89f9c3410ecde206134f94e 100644 (file)
--- 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 e2efcfbe10082c36feb1b8e88b7e73d2d1e196c1..78caa2081f4c8f6e60cae634d4fcd14251e46fe5 100644 (file)
--- 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 09ec9d5a38ee75e46bc8434df779a3f512eb6e98..aeab51e4eea03a89cfbd1446c7ffb3be9a92fe56 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -666,6 +666,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    83,
 /**/
     82,
 /**/