Patch 9.0.0308

5 views
Skip to first unread message

Bram Moolenaar

unread,
Aug 28, 2022, 5:18:49 PM8/28/22
to vim...@googlegroups.com

Patch 9.0.0308
Problem: When cmdheight is zero the attention prompt doesn't show.
Solution: Do not use the message window for a prompt.
Files: src/message.c, src/proto/message.pro, src/memline.c


*** ../vim-9.0.0307/src/message.c 2022-08-28 20:58:26.863665631 +0100
--- src/message.c 2022-08-28 22:09:10.978906604 +0100
***************
*** 1444,1449 ****
--- 1444,1462 ----
}

/*
+ * Do not use the message window for the next message(s).
+ * Used when giving a prompt.
+ */
+ void
+ dont_use_message_window(void)
+ {
+ #ifdef HAS_MESSAGE_WINDOW
+ popup_hide_message_win();
+ cmdline_row = Rows - 1;
+ #endif
+ }
+
+ /*
* Prepare for outputting characters in the command line.
*/
void
***************
*** 4073,4078 ****
--- 4086,4092 ----
}
#endif

+ dont_use_message_window();
oldState = State;
State = MODE_CONFIRM;
setmouse();
*** ../vim-9.0.0307/src/proto/message.pro 2022-08-27 21:29:28.257402847 +0100
--- src/proto/message.pro 2022-08-28 21:48:37.693935245 +0100
***************
*** 24,29 ****
--- 24,30 ----
void set_keep_msg(char_u *s, int attr);
void set_keep_msg_from_hist(void);
int use_message_window(void);
+ void dont_use_message_window(void);
void msg_start(void);
void msg_starthere(void);
void msg_putchar(int c);
*** ../vim-9.0.0307/src/memline.c 2022-08-14 14:16:07.995582211 +0100
--- src/memline.c 2022-08-28 21:48:44.673931201 +0100
***************
*** 4640,4645 ****
--- 4640,4646 ----
stat_T st;
time_t swap_mtime;

+ dont_use_message_window();
++no_wait_return;
(void)emsg(_(e_attention));
msg_puts(_("\nFound a swap file by the name \""));
*** ../vim-9.0.0307/src/version.c 2022-08-28 21:36:17.150095067 +0100
--- src/version.c 2022-08-28 21:47:14.297981269 +0100
***************
*** 709,710 ****
--- 709,712 ----
{ /* Add new patch number below this line */
+ /**/
+ 308,
/**/

--
Did Adam and Eve have navels?

/// Bram Moolenaar -- Br...@Moolenaar.net -- http://www.Moolenaar.net \\\
/// \\\
\\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
Reply all
Reply to author
Forward
0 new messages