thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

updated for version 7.0g03

Browse Source
This commit is contained in:
Bram Moolenaar
2006-05-04 21:47:50 +00:00
parent 3fb9eda7c9
commit a9587610f1
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
runtime/doc/gui.txt
View File

@@ -1,4 +1,4 @@
*gui.txt* For Vim version 7.0g. Last change: 2006 May 03 *gui.txt* For Vim version 7.0g. Last change: 2006 May 04
VIM REFERENCE MANUAL by Bram Moolenaar VIM REFERENCE MANUAL by Bram Moolenaar
@@ -102,7 +102,7 @@ There are a number of options which only have meaning in the GUI version of
Vim. These are 'guicursor', 'guifont', 'guipty' and 'guioptions'. They are Vim. These are 'guicursor', 'guifont', 'guipty' and 'guioptions'. They are
documented in |options.txt| with all the other options. documented in |options.txt| with all the other options.
If using the Motif or Athena version of the GUI (but not for the KDE, GTK+ or If using the Motif or Athena version of the GUI (but not for the GTK+ or
Win32 version), a number of X resources are available. See |gui-resources|. Win32 version), a number of X resources are available. See |gui-resources|.
Another way to set the colors for different occasions is with highlight Another way to set the colors for different occasions is with highlight
@@ -487,7 +487,7 @@ a menu entry. Hit <Enter> to execute it. Hit <Esc> if you want to cancel.
This does require the |+menu| feature enabled at compile time. This does require the |+menu| feature enabled at compile time.
*tear-off-menus* *tear-off-menus*
KDE, GTK+ and Motif support Tear-off menus. These are sort of sticky menus or GTK+ and Motif support Tear-off menus. These are sort of sticky menus or
pop-up menus that are present all the time. If the resizing does not work pop-up menus that are present all the time. If the resizing does not work
correctly, this may be caused by using something like "Vim*geometry" in the correctly, this may be caused by using something like "Vim*geometry" in the
defaults. Use "Vim.geometry" instead. defaults. Use "Vim.geometry" instead.
@@ -666,7 +666,7 @@ simple.
*gui-toolbar* *gui-toolbar*
The toolbar is currently available in the Win32, Athena, Motif, GTK+ (X11), The toolbar is currently available in the Win32, Athena, Motif, GTK+ (X11),
KDE and Photon GUI. It should turn up in other GUIs in due course. The and Photon GUI. It should turn up in other GUIs in due course. The
default toolbar is setup in menu.vim. default toolbar is setup in menu.vim.
The display of the toolbar is controlled by the 'guioptions' letter 'T'. You The display of the toolbar is controlled by the 'guioptions' letter 'T'. You
can thus have menu & toolbar together, or either on its own, or neither. can thus have menu & toolbar together, or either on its own, or neither.
@@ -754,7 +754,7 @@ from the main menu bar. You must then use the |:popup| or |:tearoff| command
to display it. to display it.
*popup-menu* *popup-menu*
In the Win32, KDE, GTK+, Motif, Athena and Photon GUI, you can define the In the Win32, GTK+, Motif, Athena and Photon GUI, you can define the
special menu "PopUp". This is the menu that is displayed when the right mouse special menu "PopUp". This is the menu that is displayed when the right mouse
button is pressed, if 'mousemodel' is set to popup or popup_setpos. button is pressed, if 'mousemodel' is set to popup or popup_setpos.
@@ -964,8 +964,6 @@ This section describes other features which are related to the GUI.
if has("gui_running") if has("gui_running")
if has("gui_gtk2") if has("gui_gtk2")
:set guifont=Luxi\ Mono\ 12 :set guifont=Luxi\ Mono\ 12
elseif has("gui_kde")
:set guifont=Luxi\ Mono/12/-1/5/50/0/0/0/1/0
elseif has("x11") elseif has("x11")
" Also for GTK 1 " Also for GTK 1
:set guifont=*-lucidatypewriter-medium-r-normal-*-*-180-*-*-m-*-* :set guifont=*-lucidatypewriter-medium-r-normal-*-*-180-*-*-m-*-*

7
src/ex_docmd.c
View File

@@ -2997,11 +2997,14 @@ cmd_exists(name)
return (cmdmods[i].name[j] == NUL ? 2 : 1); return (cmdmods[i].name[j] == NUL ? 2 : 1);
} }
/* Check built-in commands and user defined commands. */ /* Check built-in commands and user defined commands.
ea.cmd = name; * For ":2match" and ":3match" we need to skip the number. */
ea.cmd = (*name == '2' || *name == '3') ? name + 1 : name;
ea.cmdidx = (cmdidx_T)0; ea.cmdidx = (cmdidx_T)0;
if (find_command(&ea, &full) == NULL) if (find_command(&ea, &full) == NULL)
return 3; return 3;
if (vim_isdigit(*name) && ea.cmdidx != CMD_match)
return 0;
return (ea.cmdidx == CMD_SIZE ? 0 : (full ? 2 : 1)); return (ea.cmdidx == CMD_SIZE ? 0 : (full ? 2 : 1));
} }
#endif #endif