summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp/easymenu.el
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2004-11-09 14:37:10 +0000
committerStefan Monnier <monnier@iro.umontreal.ca>2004-11-09 14:37:10 +0000
commit0c90b629443728a9f6b054f351a7ac21c958ed69 (patch)
treeeddb991dd08fb33411463785fdae0451f1d1b87e /lisp/emacs-lisp/easymenu.el
parent678b3958be7b8c502160cb67af3d5663447e2314 (diff)
downloademacs-0c90b629443728a9f6b054f351a7ac21c958ed69.tar.gz
(easy-menu-intern): Revert to no-downcasing.
(easy-menu-name-match): Revert correspondingly.
Diffstat (limited to 'lisp/emacs-lisp/easymenu.el')
-rw-r--r--lisp/emacs-lisp/easymenu.el23
1 files changed, 2 insertions, 21 deletions
diff --git a/lisp/emacs-lisp/easymenu.el b/lisp/emacs-lisp/easymenu.el
index 7b18756fd7e..f42f326ba0a 100644
--- a/lisp/emacs-lisp/easymenu.el
+++ b/lisp/emacs-lisp/easymenu.el
@@ -42,25 +42,7 @@ menus, turn this variable off, otherwise it is probably better to keep it on."
:version "20.3")
(defsubst easy-menu-intern (s)
- (if (stringp s)
- (let ((copy (copy-sequence s))
- (pos 0)
- found)
- ;; For each letter that starts a word, flip its case.
- ;; This way, the usual convention for menu strings (capitalized)
- ;; corresponds to the usual convention for menu item event types
- ;; (all lower case). It's a 1-1 mapping so causes no conflicts.
- (while (setq found (string-match "\\<\\sw" copy pos))
- (setq pos (match-end 0))
- (unless (= (upcase (aref copy found))
- (downcase (aref copy found)))
- (aset copy found
- (if (= (upcase (aref copy found))
- (aref copy found))
- (downcase (aref copy found))
- (upcase (aref copy found))))))
- (intern copy))
- s))
+ (if (stringp s) (intern s) s))
;;;###autoload
(put 'easy-menu-define 'lisp-indent-function 'defun)
@@ -437,8 +419,7 @@ ITEM should be a keymap binding of the form (KEY . MENU-ITEM)."
(error nil)) ;`item' might not be a proper list.
;; Also check the string version of the symbol name,
;; for backwards compatibility.
- (eq (car-safe item) (intern name))
- (eq (car-safe item) (easy-menu-intern name)))))))
+ (eq (car-safe item) (intern name)))))))
(defun easy-menu-always-true-p (x)
"Return true if form X never evaluates to nil."