Mercurial > vim
comparison src/message.c @ 29916:cf55d7e10bb1 v9.0.0296
patch 9.0.0296: message in popup is shortened unnecessary
Commit: https://github.com/vim/vim/commit/35a4fbc5d04820d9b08e7da2e295a7e8210e2e2c
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Aug 28 14:39:53 2022 +0100
patch 9.0.0296: message in popup is shortened unnecessary
Problem: Message in popup is shortened unnecessary.
Solution: Do not use 'showcmd' and 'ruler' for a message in the popup.
Set the timer when unhiding the message popup.
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Sun, 28 Aug 2022 15:45:04 +0200 |
parents | 2516775e8134 |
children | 6d75b361e9c2 |
comparison
equal
deleted
inserted
replaced
29915:6717edc7d645 | 29916:cf55d7e10bb1 |
---|---|
204 // May truncate message to avoid a hit-return prompt | 204 // May truncate message to avoid a hit-return prompt |
205 if ((!msg_scroll && !need_wait_return && shortmess(SHM_TRUNCALL) | 205 if ((!msg_scroll && !need_wait_return && shortmess(SHM_TRUNCALL) |
206 && !exmode_active && msg_silent == 0) || force) | 206 && !exmode_active && msg_silent == 0) || force) |
207 { | 207 { |
208 len = vim_strsize(s); | 208 len = vim_strsize(s); |
209 if (msg_scrolled != 0) | 209 if (msg_scrolled != 0 |
210 #ifdef HAS_MESSAGE_WINDOW | |
211 || use_message_window() | |
212 #endif | |
213 ) | |
210 // Use all the columns. | 214 // Use all the columns. |
211 room = (int)(Rows - msg_row) * Columns - 1; | 215 room = (int)(Rows - msg_row) * Columns - 1; |
212 else | 216 else |
213 // Use up to 'showcmd' column. | 217 // Use up to 'showcmd' column. |
214 room = (int)(Rows - msg_row - 1) * Columns + sc_col - 1; | 218 room = (int)(Rows - msg_row - 1) * Columns + sc_col - 1; |
3717 * wait for hit-return and redraw the window later. | 3721 * wait for hit-return and redraw the window later. |
3718 */ | 3722 */ |
3719 void | 3723 void |
3720 msg_check(void) | 3724 msg_check(void) |
3721 { | 3725 { |
3722 if (msg_row == Rows - 1 && msg_col >= sc_col) | 3726 if (msg_row == Rows - 1 && msg_col >= sc_col |
3727 #ifdef HAS_MESSAGE_WINDOW | |
3728 && !use_message_window() | |
3729 #endif | |
3730 ) | |
3723 { | 3731 { |
3724 need_wait_return = TRUE; | 3732 need_wait_return = TRUE; |
3725 redraw_cmdline = TRUE; | 3733 redraw_cmdline = TRUE; |
3726 } | 3734 } |
3727 } | 3735 } |