andros/emacs-gpu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixes for Mouse Menu node.

Browse source 
* doc/lispref/keymaps.texi (Mouse Menus): Describe non-toolkit behavior as the
non-default situation.  Describe one-submenu exception.

* doc/lispref/nonascii.texi (Character Properties): Copyedits.

Fixes: debbugs:7695
This commit is contained in:
Chong Yidong 2012-03-10 11:27:10 +08:00
parent a53925272e
commit 83ef8187f4
4 changed files with 34 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
admin/FOR-RELEASE
View file

@ -214,7 +214,7 @@ maps.texi rgm
markers.texi rgm
minibuf.texi
modes.texi cyd
nonascii.texi
nonascii.texi cyd
numbers.texi cyd
objects.texi cyd
os.texi
@ -227,7 +227,7 @@ streams.texi cyd
strings.texi cyd
symbols.texi cyd
syntax.texi cyd
text.texi
text.texi cyd
tips.texi rgm
variables.texi cyd
windows.texi

7
doc/lispref/ChangeLog
View file

@ -1,3 +1,10 @@
2012-03-10 Chong Yidong <cyd@gnu.org>
* keymaps.texi (Mouse Menus): Describe non-toolkit behavior as the
non-default situation. Describe one-submenu exception (Bug#7695).
* nonascii.texi (Character Properties): Copyedits.
2012-03-08 Chong Yidong <cyd@gnu.org>
* text.texi (Mode-Specific Indent): Document new behavior of

35
doc/lispref/keymaps.texi
View file

@ -2345,24 +2345,25 @@ multiple levels or comes from the menu bar.)
It's often best to use a button-down event to trigger the menu. Then
the user can select a menu item by releasing the button.
A single keymap can appear as multiple menu panes, if you explicitly
arrange for this. The way to do this is to make a keymap for each pane,
then create a binding for each of those maps in the main keymap of the
menu. Give each of these bindings an item string that starts with
@samp{@@}. The rest of the item string becomes the name of the pane.
See the file @file{lisp/mouse.el} for an example of this. Any ordinary
bindings with @samp{@@}-less item strings are grouped into one pane,
which appears along with the other panes explicitly created for the
submaps.
@cindex submenu
If the menu keymap contains a binding to a nested keymap, the nested
keymap specifies a @dfn{submenu}. There will be a menu item, labeled
by the nested keymap's item string, and clicking on this item
automatically pops up the specified submenu. As a special exception,
if the menu keymap contains a single nested keymap and no other menu
items, the menu shows the contents of the nested keymap directly, not
as a submenu.
X toolkit menus don't have panes; instead, they can have submenus.
Every nested keymap becomes a submenu, whether the item string starts
with @samp{@@} or not. In a toolkit version of Emacs, the only thing
special about @samp{@@} at the beginning of an item string is that the
@samp{@@} doesn't appear in the menu item.
Multiple keymaps that define the same menu prefix key produce
separate panes or separate submenus.
However, if Emacs is compiled without X toolkit support, submenus
are not supported. Each nested keymap is shown as a menu item, but
clicking on it does not automatically pop up the submenu. If you wish
to imitate the effect of submenus, you can do that by giving a nested
keymap an item string which starts with @samp{@@}. This causes Emacs
to display the nested keymap using a separate @dfn{menu pane}; the
rest of the item string after the @samp{@@} is the pane label. If
Emacs is compiled without X toolkit support, menu panes are not used;
in that case, a @samp{@@} at the beginning of an item string is
omitted when the menu label is displayed, and has no other effect.
@node Keyboard Menus
@subsection Menus and the Keyboard

15
doc/lispref/nonascii.texi
View file

@ -412,14 +412,13 @@ or @code{R} (strong R).
Corresponds to the Unicode @code{Decomposition_Type} and
@code{Decomposition_Value} properties. The value is a list, whose
first element may be a symbol representing a compatibility formatting
tag, such as @code{small}@footnote{
Note that the Unicode spec writes these tag names inside
@samp{<..>} brackets. The tag names in Emacs do not include the
brackets; e.g., Unicode specifies @samp{<small>} where Emacs uses
@samp{small}.
}; the other elements are characters that give the compatibility
decomposition sequence of this character. For unassigned codepoints,
the value is the character itself.
tag, such as @code{small}@footnote{The Unicode specification writes
these tag names inside @samp{<..>} brackets, but the tag names in
Emacs do not include the brackets; e.g.@: Unicode specifies
@samp{<small>} where Emacs uses @samp{small}. }; the other elements
are characters that give the compatibility decomposition sequence of
this character. For unassigned codepoints, the value is the character
itself.
@item decimal-digit-value
Corresponds to the Unicode @code{Numeric_Value} property for