Mercurial > emacs
changeset 79779:e5bf94d898ea
(mouse-major-mode-menu): Suppress duplicate menus.
author | Glenn Morris <rgm@gnu.org> |
---|---|
date | Tue, 08 Jan 2008 05:13:16 +0000 |
parents | dd942ccbf919 |
children | ffa20c20b5fb |
files | lisp/mouse.el |
diffstat | 1 files changed, 13 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/mouse.el Tue Jan 08 05:01:41 2008 +0000 +++ b/lisp/mouse.el Tue Jan 08 05:13:16 2008 +0000 @@ -173,11 +173,22 @@ ;; default to the edit menu. (newmap (if ancestor (make-sparse-keymap (concat mode-name " Mode")) - menu-bar-edit-menu))) + menu-bar-edit-menu)) + uniq) (if ancestor ;; Make our menu inherit from the desired keymap which we want ;; to display as the menu now. - (set-keymap-parent newmap ancestor)) + ;; Sometimes keymaps contain duplicate menu code, leading to + ;; duplicates in the popped-up menu. Avoid this by simply + ;; taking the first of any identically-named menus. + ;; http://lists.gnu.org/archive/html/emacs-devel/2007-11/msg00469.html + (set-keymap-parent newmap + (progn + (dolist (e ancestor) + (unless (and (listp e) + (assoc (car e) uniq)) + (setq uniq (append uniq (list e))))) + uniq))) (popup-menu newmap event prefix)))