* subr.el (event-modifiers): Use internal-event-symbol-parse-modifiers.

* keyboard.c (Fevent_symbol_parse_modifiers): New function.
(syms_of_keyboard): Defsubr it.

2 files changed, 5 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f39752b4e18..baf66e2007a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2007-11-15  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+        * subr.el (event-modifiers): Use internal-event-symbol-parse-modifiers.
+
         * pcvs.el (cvs-revert-if-needed): Ignore `unknown' files, since cvs
         did not touch them.
 
diff --git a/lisp/subr.el b/lisp/subr.el
index 17abc70e073..39bd8ea13c2 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -723,7 +723,9 @@ even when EVENT actually has modifiers."
     (if (listp type)
         (setq type (car type)))
     (if (symbolp type)
-        (cdr (get type 'event-symbol-elements))
+        ;; Don't read event-symbol-elements directly since we're not
+        ;; sure the symbol has already been parsed.
+        (cdr (internal-event-symbol-parse-modifiers type))
       (let ((list nil)
             (char (logand type (lognot (logior ?\M-\^@ ?\C-\^@ ?\S-\^@
                                                ?\H-\^@ ?\s-\^@ ?\A-\^@)))))