diff options
| -rw-r--r-- | lispref/keymaps.texi | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/lispref/keymaps.texi b/lispref/keymaps.texi index 9cf73053291..f374472e101 100644 --- a/lispref/keymaps.texi +++ b/lispref/keymaps.texi | |||
| @@ -1930,8 +1930,8 @@ where @var{separator-type} is a string starting with two or more dashes. | |||
| 1930 | That specifies the default kind of separator. (For compatibility, | 1930 | That specifies the default kind of separator. (For compatibility, |
| 1931 | @code{""} and @code{-} also count as separators.) | 1931 | @code{""} and @code{-} also count as separators.) |
| 1932 | 1932 | ||
| 1933 | Starting in Emacs 21, certain other values of @var{separator-type} | 1933 | Certain other values of @var{separator-type} specify a different |
| 1934 | specify a different style of separator. Here is a table of them: | 1934 | style of separator. Here is a table of them: |
| 1935 | 1935 | ||
| 1936 | @table @code | 1936 | @table @code |
| 1937 | @item "--no-line" | 1937 | @item "--no-line" |
| @@ -2247,9 +2247,11 @@ at the end of the menu bar, following local menu items. | |||
| 2247 | @end defvar | 2247 | @end defvar |
| 2248 | 2248 | ||
| 2249 | @defvar menu-bar-update-hook | 2249 | @defvar menu-bar-update-hook |
| 2250 | This normal hook is run whenever the user clicks on the menu bar, before | 2250 | This normal hook is run by redisplay to update the menu bar contents, |
| 2251 | displaying a submenu. You can use it to update submenus whose contents | 2251 | before redisplaying the menu bar. You can use it to update submenus |
| 2252 | should vary. | 2252 | whose contents should vary. Since this hook is run frequently, we |
| 2253 | advise you to ensure that the functions it calls do not take much time | ||
| 2254 | in the usual case. | ||
| 2253 | @end defvar | 2255 | @end defvar |
| 2254 | 2256 | ||
| 2255 | @node Tool Bar | 2257 | @node Tool Bar |
| @@ -2258,7 +2260,7 @@ should vary. | |||
| 2258 | 2260 | ||
| 2259 | A @dfn{tool bar} is a row of icons at the top of a frame, that execute | 2261 | A @dfn{tool bar} is a row of icons at the top of a frame, that execute |
| 2260 | commands when you click on them---in effect, a kind of graphical menu | 2262 | commands when you click on them---in effect, a kind of graphical menu |
| 2261 | bar. Emacs supports tool bars starting with version 21. | 2263 | bar. |
| 2262 | 2264 | ||
| 2263 | The frame parameter @code{tool-bar-lines} (X resource @samp{toolBar}) | 2265 | The frame parameter @code{tool-bar-lines} (X resource @samp{toolBar}) |
| 2264 | controls how many lines' worth of height to reserve for the tool bar. A | 2266 | controls how many lines' worth of height to reserve for the tool bar. A |