aboutsummaryrefslogtreecommitdiffstats
path: root/src/menu.c
diff options
context:
space:
mode:
authorK. Handa2015-09-27 17:06:12 +0900
committerK. Handa2015-09-27 17:06:12 +0900
commit52beda922d2cb523a03661bf74b8678c8b45e440 (patch)
tree04617b37298746a61d5324a5b35c9b71f439d762 /src/menu.c
parent94ed5167557112fb00eeca05e62589db744206de (diff)
parent1ac5a9c20cb22efb398fa18781c6b932dd4e54df (diff)
downloademacs-52beda922d2cb523a03661bf74b8678c8b45e440.tar.gz
emacs-52beda922d2cb523a03661bf74b8678c8b45e440.zip
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
Diffstat (limited to 'src/menu.c')
-rw-r--r--src/menu.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/menu.c b/src/menu.c
index e36fe260f24..dc82809629a 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -1129,7 +1129,7 @@ If POSITION is t, it means to use the current mouse position.
1129MENU is a specifier for a menu. For the simplest case, MENU is a keymap. 1129MENU is a specifier for a menu. For the simplest case, MENU is a keymap.
1130The menu items come from key bindings that have a menu string as well as 1130The menu items come from key bindings that have a menu string as well as
1131a definition; actually, the "definition" in such a key binding looks like 1131a definition; actually, the "definition" in such a key binding looks like
1132\(STRING . REAL-DEFINITION). To give the menu a title, put a string into 1132(STRING . REAL-DEFINITION). To give the menu a title, put a string into
1133the keymap as a top-level element. 1133the keymap as a top-level element.
1134 1134
1135If REAL-DEFINITION is nil, that puts a nonselectable string in the menu. 1135If REAL-DEFINITION is nil, that puts a nonselectable string in the menu.
@@ -1491,7 +1491,7 @@ The return value is VALUE from the chosen item.
1491An ITEM may also be just a string--that makes a nonselectable item. 1491An ITEM may also be just a string--that makes a nonselectable item.
1492An ITEM may also be nil--that means to put all preceding items 1492An ITEM may also be nil--that means to put all preceding items
1493on the left of the dialog box and all following items on the right. 1493on the left of the dialog box and all following items on the right.
1494\(By default, approximately half appear on each side.) 1494(By default, approximately half appear on each side.)
1495 1495
1496If HEADER is non-nil, the frame title for the box is "Information", 1496If HEADER is non-nil, the frame title for the box is "Information",
1497otherwise it is "Question". 1497otherwise it is "Question".