aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2000-07-16 17:16:28 +0000
committerStefan Monnier2000-07-16 17:16:28 +0000
commita45423d8fabea1bfb09b58be3432d07fd12346c5 (patch)
treeb6a4ba997898f6d1d07c6453ae8979816a0e169b
parent91a38db1dd7b8e624662f799de878a990a3bc9c5 (diff)
downloademacs-a45423d8fabea1bfb09b58be3432d07fd12346c5.tar.gz
emacs-a45423d8fabea1bfb09b58be3432d07fd12346c5.zip
(mouse-major-mode-menu-1): get the submenu with lookup-key.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/mouse.el4
2 files changed, 6 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 32a049e182f..e4b9f961de6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12000-07-16 Stefan Monnier <monnier@cs.yale.edu>
2
3 * mouse.el (mouse-major-mode-menu-1): get the submenu with lookup-key.
4
12000-07-16 Dave Love <fx@gnu.org> 52000-07-16 Dave Love <fx@gnu.org>
2 6
3 * cus-edit.el (custom-buffer-create-internal): Use a help-echo 7 * cus-edit.el (custom-buffer-create-internal): Use a help-echo
diff --git a/lisp/mouse.el b/lisp/mouse.el
index e54ecd0cf80..9057e781d5d 100644
--- a/lisp/mouse.el
+++ b/lisp/mouse.el
@@ -115,7 +115,7 @@ Default to the Edit menu if the major mode doesn't define a menu."
115 (if (eq submap t) 115 (if (eq submap t)
116 menubar 116 menubar
117 (setq mouse-major-mode-menu-prefix (list (car submap))) 117 (setq mouse-major-mode-menu-prefix (list (car submap)))
118 (cdr (cdr submap)))))) 118 (lookup-key menubar (vector (car submap)))))))
119 119
120;; Commands that operate on windows. 120;; Commands that operate on windows.
121 121
@@ -309,7 +309,7 @@ MODE-LINE-P non-nil means a mode line is dragged."
309 ;; 309 ;;
310 ;; if size change caused space to be stolen 310 ;; if size change caused space to be stolen
311 ;; from a window above this one, rescind the 311 ;; from a window above this one, rescind the
312 ;; change, but only if we didn't grow/srhink 312 ;; change, but only if we didn't grow/shrink
313 ;; the minibuffer. minibuffer size changes 313 ;; the minibuffer. minibuffer size changes
314 ;; can cause all windows to shrink... no way 314 ;; can cause all windows to shrink... no way
315 ;; around it. 315 ;; around it.