[Emacs-diffs] Changes to emacs/lisp/emacs-lisp/easymenu.el

[Richard M . Stallman]

Index: emacs/lisp/emacs-lisp/easymenu.el
diff -c emacs/lisp/emacs-lisp/easymenu.el:1.71 
emacs/lisp/emacs-lisp/easymenu.el:1.72
*** emacs/lisp/emacs-lisp/easymenu.el:1.71      Wed Nov 10 16:20:20 2004
--- emacs/lisp/emacs-lisp/easymenu.el   Sat Apr 23 16:38:03 2005
***************
*** 160,177 ****
    (let ((keymap (easy-menu-create-menu (car menu) (cdr menu))))
      (when symbol
        (set symbol keymap)
!       (fset symbol
!           `(lambda (event) ,doc (interactive "@e")
!              ;; FIXME: XEmacs uses popup-menu which calls the binding
!              ;; while x-popup-menu only returns the selection.
!              (x-popup-menu event
!                            (or (and (symbolp ,symbol)
!                                     (funcall
!                                      (or (plist-get (get ,symbol 'menu-prop)
!                                                     :filter)
!                                          'identity)
!                                      (symbol-function ,symbol)))
!                                ,symbol)))))
      (mapcar (lambda (map)
              (define-key map (vector 'menu-bar (easy-menu-intern (car menu)))
                (cons 'menu-item
--- 160,177 ----
    (let ((keymap (easy-menu-create-menu (car menu) (cdr menu))))
      (when symbol
        (set symbol keymap)
!       (defalias symbol
!       `(lambda (event) ,doc (interactive "@e")
!          ;; FIXME: XEmacs uses popup-menu which calls the binding
!          ;; while x-popup-menu only returns the selection.
!          (x-popup-menu event
!                        (or (and (symbolp ,symbol)
!                                 (funcall
!                                  (or (plist-get (get ,symbol 'menu-prop)
!                                                 :filter)
!                                      'identity)
!                                  (symbol-function ,symbol)))
!                            ,symbol)))))
      (mapcar (lambda (map)
              (define-key map (vector 'menu-bar (easy-menu-intern (car menu)))
                (cons 'menu-item