diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6f19f4141d3..1ebc720cae0 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2000-05-21  Dave Love  <fx@gnu.org>
 
+	* edmacro.el (edmacro-parse-keys): Return vector if any elements
+	are invalid characters.
+
 	* international/mule-util.el (detect-coding-with-priority): Use
 	mapc.  Remove redundant lambda.
 
diff --git a/lisp/edmacro.el b/lisp/edmacro.el
index 1b8a3b569c6..d53bdb11359 100644
--- a/lisp/edmacro.el
+++ b/lisp/edmacro.el
@@ -711,7 +711,7 @@ If START or END is negative, it counts from the end."
       (setq res (edmacro-subseq res 2 -2)))
     (if (and (not need-vector)
 	     (loop for ch across res
-		   always (and (integerp ch)
+		   always (and (char-valid-p ch)
 			       (let ((ch2 (logand ch (lognot ?\M-\^@))))
 				 (and (>= ch2 0) (<= ch2 127))))))
 	(concat (loop for ch across res