Mercurial > emacs
diff lisp/mouse.el @ 90228:fa0da9b57058
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-82
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 542-553)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 116-121)
- Merge from emacs--cvs-trunk--0
- Update from CVS
author | Miles Bader <miles@gnu.org> |
---|---|
date | Mon, 19 Sep 2005 10:20:33 +0000 |
parents | 10fe5fadaf89 f2fdccb16607 |
children | ee12d75eb214 |
line wrap: on
line diff
--- a/lisp/mouse.el Sun Sep 11 22:21:01 2005 +0000 +++ b/lisp/mouse.el Mon Sep 19 10:20:33 2005 +0000 @@ -153,7 +153,7 @@ (defvar mouse-major-mode-menu-prefix) ; dynamically bound -(defun mouse-major-mode-menu (event prefix) +(defun mouse-major-mode-menu (event &optional prefix) "Pop up a mode-specific menu of mouse commands. Default to the Edit menu if the major mode doesn't define a menu." ;; Switch to the window clicked on, because otherwise @@ -173,8 +173,7 @@ ;; default to the edit menu. (newmap (if ancestor (make-sparse-keymap (concat mode-name " Mode")) - menu-bar-edit-menu)) - result) + menu-bar-edit-menu))) (if ancestor ;; Make our menu inherit from the desired keymap which we want ;; to display as the menu now.