Merge from emacs--devo--0

[gnu-emacs] / lisp / edmacro.el

diff --git a/lisp/edmacro.el b/lisp/edmacro.el
index abd08f4b0b9d8fa937ee4b9177c92a51b9949829..55138f18bca67705915fb1d93b23f86b25c1afab 100644 (file)
--- a/lisp/edmacro.el
+++ b/lisp/edmacro.el
@@ -768,7 +768,7 @@ This function assumes that the events can be stored in a string."
       (setq res (edmacro-subseq res 2 -2)))
     (if (and (not need-vector)
             (loop for ch across res
-                  always (and (char-valid-p ch)
+                  always (and (characterp ch)
                               (let ((ch2 (logand ch (lognot ?\M-\^@))))
                                 (and (>= ch2 0) (<= ch2 127))))))
        (concat (loop for ch across res