From: Richard M. Stallman <rms@gnu.org>
Date: Tue, 2 Nov 2004 09:26:28 +0000 (+0000)
Subject: (easy-menu-intern):
X-Git-Tag: ttn-vms-21-2-B4~4241
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=da6e3103c4143e18ed96c943b1519fc3e137ea66;p=emacs.git

(easy-menu-intern):
Don't downcase; rather, case-flip the first letter of each word.
---

diff --git a/lisp/emacs-lisp/easymenu.el b/lisp/emacs-lisp/easymenu.el
index dbd7194f50a..e039b80aee5 100644
--- a/lisp/emacs-lisp/easymenu.el
+++ b/lisp/emacs-lisp/easymenu.el
@@ -42,7 +42,25 @@ 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) (intern (downcase s)) 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))
 
 ;;;###autoload
 (put 'easy-menu-define 'lisp-indent-function 'defun)