[Emacs-diffs] Changes to emacs/lisp/mouse.el,v

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        08/04/04 17:31:21

Index: lisp/mouse.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/mouse.el,v
retrieving revision 1.330
retrieving revision 1.331
diff -u -b -r1.330 -r1.331
--- lisp/mouse.el       2 Apr 2008 20:16:33 -0000       1.330
+++ lisp/mouse.el       4 Apr 2008 17:31:19 -0000       1.331
@@ -201,19 +201,7 @@
                   menu-bar-edit-menu))
         uniq)
     (if ancestor
-       ;; Make our menu inherit from the desired keymap which we want
-       ;; to display as the menu now.
-       ;; 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)))
+       (set-keymap-parent newmap ancestor))
     (popup-menu newmap event prefix)))
 
 
@@ -225,7 +213,7 @@
       (let (submap)
         (map-keymap
          (lambda (k v) (setq submap (if submap t (cons k v))))
-         menubar)
+         (keymap-canonicalize menubar))
         (if (eq submap t)
             menubar
           (lookup-key menubar (vector (car submap)))))))
@@ -246,7 +234,6 @@
         ;; display non-empty menu pane names.
         (minor-mode-menus
          (mapcar
-          (function
            (lambda (menu)
              (let* ((minor-mode (car menu))
                     (menu (cdr menu))
@@ -260,7 +247,7 @@
                                                            minor-mode)))
                                       " Menu")
                                      (cdr menu)))))
-               menu)))
+               menu))
           (minor-mode-key-binding [menu-bar])))
         (local-title-or-map (and local-menu (cadr local-menu)))
         (global-title-or-map (cadr global-menu)))