aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/emacs-lisp/easymenu.el8
1 files changed, 4 insertions, 4 deletions
diff --git a/lisp/emacs-lisp/easymenu.el b/lisp/emacs-lisp/easymenu.el
index 70343580209..ae3af3cc644 100644
--- a/lisp/emacs-lisp/easymenu.el
+++ b/lisp/emacs-lisp/easymenu.el
@@ -174,9 +174,9 @@ possibly preceded by keyword pairs as described in `easy-menu-define'."
174 (let ((menu (make-sparse-keymap menu-name)) 174 (let ((menu (make-sparse-keymap menu-name))
175 prop keyword arg label enable filter visible help) 175 prop keyword arg label enable filter visible help)
176 ;; Look for keywords. 176 ;; Look for keywords.
177 (while (and menu-items (cdr menu-items) 177 (while (and menu-items
178 (symbolp (setq keyword (car menu-items))) 178 (cdr menu-items)
179 (= ?: (aref (symbol-name keyword) 0))) 179 (keywordp (setq keyword (car menu-items))))
180 (setq arg (cadr menu-items)) 180 (setq arg (cadr menu-items))
181 (setq menu-items (cddr menu-items)) 181 (setq menu-items (cddr menu-items))
182 (cond 182 (cond
@@ -240,7 +240,7 @@ possibly preceded by keyword pairs as described in `easy-menu-define'."
240 cache cache-specified) 240 cache cache-specified)
241 (setq label (setq name (aref item 0))) 241 (setq label (setq name (aref item 0)))
242 (if no-name (setq command (easy-menu-make-symbol command))) 242 (if no-name (setq command (easy-menu-make-symbol command)))
243 (if (and (symbolp active) (= ?: (aref (symbol-name active) 0))) 243 (if (keywordp active)
244 (let ((count 2) 244 (let ((count 2)
245 keyword arg suffix visible style selected keys) 245 keyword arg suffix visible style selected keys)
246 (setq active nil) 246 (setq active nil)