From: Stefan Monnier Date: Fri, 14 Jul 2000 08:39:48 +0000 (+0000) Subject: (easy-menu-convert-item-1): Intern the label. X-Git-Tag: emacs-pretest-21.0.90~2838 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3a4f3f86ef4217d557b1969aef898cf66b7c64e5;p=emacs.git (easy-menu-convert-item-1): Intern the label. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 79d755abb8a..b04d70ac7ff 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2000-07-14 Stefan Monnier + + * emacs-lisp/easymenu.el (easy-menu-convert-item-1): Intern the label. + 2000-07-13 Dave Love * emacs-lisp/easymenu.el: Doc fixes. @@ -15,8 +19,8 @@ 2000-07-13 Dave Love - * progmodes/fortran.el (fortran-imenu-generic-expression): Change - definition layout. + * progmodes/fortran.el (fortran-imenu-generic-expression): + Change definition layout. (fortran-mode-menu): Reinstate customize entries. * cus-edit.el (custom-group-menu-create, customize-menu-create): @@ -35,30 +39,27 @@ 2000-07-11 Dave Love - * progmodes/fortran.el: Don't require easymenu. Use repeat counts - in various regexps. + * progmodes/fortran.el: Don't require easymenu. + Use repeat counts in various regexps. (fortran-mode-syntax-table): Defvar directly. (fortran-font-lock-keywords-1, fortran-font-lock-keywords-2) - (fortran-font-lock-keywords-3, - fortran-font-lock-syntactic-keywords): Use defvar, not defconst. - (fortran-mode-map): Change locals in `let'. Use - `fortran-auto-fill'. + (fortran-font-lock-keywords-3, fortran-font-lock-syntactic-keywords): + Use defvar, not defconst. + (fortran-mode-map): Change locals in `let'. Use `fortran-auto-fill'. (fortran-mode): Set fortran-comment-line-start-skip, fortran-comment-line-start-skip, dabbrev-case-fold-search. (fortran-comment-indent): Use defsubst. - (fortran-indent-comment, fortran-indent-to-column, - fortran-break-line): Use fortran-comment-indent, not - fortran-comment-indent-function. + (fortran-indent-comment, fortran-indent-to-column, fortran-break-line): + Use fortran-comment-indent, not fortran-comment-indent-function. (fortran-comment-region, fortran-electric-line-number): Simplify. (fortran-auto-fill): New function. (fortran-do-auto-fill): Deleted. - (fortran-find-comment-start-skip): Check for non-null - comment-start-skip. - (fortran-auto-fill-mode, fortran-fill-statement): Use - fortran-auto-fill. + (fortran-find-comment-start-skip): + Check for non-null comment-start-skip. + (fortran-auto-fill-mode, fortran-fill-statement): + Use fortran-auto-fill. (fortran-fill): Use fortran-auto-fill. Check for null - comment-start-skip. Simplify final clause and use end-of-line - finally. + comment-start-skip. Simplify final clause and use end-of-line finally. * widget.el (widget-plist-member): New alias. @@ -80,7 +81,7 @@ 2000-07-10 Kenichi Handa * international/mule-diag.el (describe-font): Adjusted for the - chnage of fontset-info. + change of fontset-info. (print-fontset): Likewise. 2000-07-09 Stefan Monnier @@ -205,7 +206,7 @@ list used by the standalone info reader). * info.el (info-initialize): Use prune-directory-list to remove - non-existant directories from Info-directory-list. + non-existent directories from Info-directory-list. * paths.el (Info-default-directory-list): Try a list of possible info-directories instead of a single one. Add the possible @@ -258,8 +259,7 @@ * window.el (some-window): New function. (walk-windows): Remove reference to walk-windows-start. - * hilit19.el (hilit-lookup-face-create): Don't set face colors - to nil. + * hilit19.el (hilit-lookup-face-create): Don't set face colors to nil. 2000-07-03 Richard Stallman @@ -287,8 +287,8 @@ 2000-06-28 Eli Zaretskii - * menu-bar.el (menu-bar-edit-menu) : Change - name to "Select All". + * menu-bar.el (menu-bar-edit-menu) : + Change name to "Select All". * dos-fns.el (convert-standard-filename): Fix last change. @@ -353,8 +353,7 @@ 2000-06-25 Eli Zaretskii - * international/codepage.el (cp-coding-system-for-codepage-1): Doc - fix. + * international/codepage.el (cp-coding-system-for-codepage-1): Doc fix. (cp864-decode-table): Doc fix. (cp720-decode-table): New variable, supports the Arabic OEM codepage used by Windows. diff --git a/lisp/emacs-lisp/easymenu.el b/lisp/emacs-lisp/easymenu.el index 221a7a9c39d..49eaa551e13 100644 --- a/lisp/emacs-lisp/easymenu.el +++ b/lisp/emacs-lisp/easymenu.el @@ -351,11 +351,15 @@ MENU, just change it, otherwise put it last in MENU." (or (null cache) (stringp cache) (vectorp cache))) (setq prop (cons :key-sequence (cons cache prop)))))) (t (error "Invalid menu item in easymenu"))) - (cons name (and (not remove) - (cons 'menu-item - (cons label - (and name - (cons command prop)))))))) + ;; `intern' the name so as to merge multiple entries with the same name. + ;; It also makes it easier/possible to lookup/change menu bindings + ;; via keymap functions. + (cons (intern name) + (and (not remove) + (cons 'menu-item + (cons label + (and name + (cons command prop)))))))) (defun easy-menu-define-key-intern (menu key item &optional before) "Like easy-menu-define-key, but interns KEY and BEFORE if they are strings."