aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong2011-01-28 12:18:54 -0500
committerChong Yidong2011-01-28 12:18:54 -0500
commitd1f14baa30f7e2898bbfc7ea68fe93020b69a901 (patch)
tree2f5b4b0560eac7683bb2106de206f7b3e8b32524
parent46b3f2bedc620f3cec2dd3e5fab9df3e30d70c2e (diff)
downloademacs-d1f14baa30f7e2898bbfc7ea68fe93020b69a901.tar.gz
emacs-d1f14baa30f7e2898bbfc7ea68fe93020b69a901.zip
* mouse.el (mouse-menu-non-singleton): Doc fix (Bug#7801).
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/mouse.el6
2 files changed, 7 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c4450a4eea6..c35e3db23e6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12011-01-28 Chong Yidong <cyd@stupidchicken.com>
2
3 * mouse.el (mouse-menu-non-singleton): Doc fix (Bug#7801).
4
12011-01-28 Kenichi Handa <handa@m17n.org> 52011-01-28 Kenichi Handa <handa@m17n.org>
2 6
3 * international/quail.el (quail-keyboard-layout-alist): Remove 7 * international/quail.el (quail-keyboard-layout-alist): Remove
diff --git a/lisp/mouse.el b/lisp/mouse.el
index 2e02448e0fb..bed4776c135 100644
--- a/lisp/mouse.el
+++ b/lisp/mouse.el
@@ -198,9 +198,9 @@ items `Turn Off' and `Help'."
198 newmap)) 198 newmap))
199 199
200(defun mouse-menu-non-singleton (menubar) 200(defun mouse-menu-non-singleton (menubar)
201 "Given menu keymap, 201 "Return menu keybar MENUBAR, or a lone submenu inside it.
202if it defines exactly one submenu, return just that submenu. 202If MENUBAR defines exactly one submenu, return just that submenu.
203Otherwise return the whole menu." 203Otherwise, return MENUBAR."
204 (if menubar 204 (if menubar
205 (let (submap) 205 (let (submap)
206 (map-keymap 206 (map-keymap