summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2006-03-18 21:31:46 +0000
committerBram Moolenaar <Bram@vim.org>2006-03-18 21:31:46 +0000
commit8d6ea5eb4f69ea5929dc6e990bb3fadf557a330a (patch)
tree830389d3024a9b8f85a84fed62cc9e9dc4264fd3
parentbe4d506b5fef4e5da5f24f036302a5723a2d2e9c (diff)
downloadvim-git-8d6ea5eb4f69ea5929dc6e990bb3fadf557a330a.tar.gz
updated for version 7.0228
-rw-r--r--runtime/doc/quickref.txt3
-rw-r--r--src/gui_w48.c4
2 files changed, 4 insertions, 3 deletions
diff --git a/runtime/doc/quickref.txt b/runtime/doc/quickref.txt
index 6e67e2afd..8570a2b8b 100644
--- a/runtime/doc/quickref.txt
+++ b/runtime/doc/quickref.txt
@@ -1,4 +1,4 @@
-*quickref.txt* For Vim version 7.0aa. Last change: 2006 Mar 16
+*quickref.txt* For Vim version 7.0aa. Last change: 2006 Mar 18
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -917,6 +917,7 @@ Short explanation of each option: *option-list*
'winaltkeys' 'wak' when the windows system handles ALT keys
'winheight' 'wh' minimum number of lines for the current window
'winfixheight' 'wfh' keep window height when opening/closing windows
+'winfixwidth' 'wfw' keep window width when opening/closing windows
'winminheight' 'wmh' minimum number of lines for any window
'winminwidth' 'wmw' minimal number of columns for any window
'winwidth' 'wiw' minimal number of columns for current window
diff --git a/src/gui_w48.c b/src/gui_w48.c
index 3aa028ee4..35c215ac9 100644
--- a/src/gui_w48.c
+++ b/src/gui_w48.c
@@ -1679,7 +1679,7 @@ process_message(void)
* mapped we want to use the mapping instead. */
if (vk == VK_F10
&& gui.menu_is_active
- && check_map(k10, State, FALSE, TRUE) == NULL)
+ && check_map(k10, State, FALSE, TRUE, FALSE) == NULL)
break;
#endif
if (GetKeyState(VK_SHIFT) & 0x8000)
@@ -1793,7 +1793,7 @@ process_message(void)
/* Check for <F10>: Default effect is to select the menu. When <F10> is
* mapped we need to stop it here to avoid strange effects (e.g., for the
* key-up event) */
- if (vk != VK_F10 || check_map(k10, State, FALSE, TRUE) == NULL)
+ if (vk != VK_F10 || check_map(k10, State, FALSE, TRUE, FALSE) == NULL)
#endif
DispatchMessage(&msg);
}