aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Love2000-05-21 19:51:14 +0000
committerDave Love2000-05-21 19:51:14 +0000
commitac2665815a33a8bd106741f13e06dcdd0033ea41 (patch)
tree65510b533b2f5afe89afd78777c5b0aaf66c7db9
parentcb7216a79a8a82cafaccf5506d187d3ac6ff4711 (diff)
downloademacs-ac2665815a33a8bd106741f13e06dcdd0033ea41.tar.gz
emacs-ac2665815a33a8bd106741f13e06dcdd0033ea41.zip
(edmacro-parse-keys): Return vector if any elements are invalid
characters.
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/edmacro.el2
2 files changed, 4 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6f19f4141d3..1ebc720cae0 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
12000-05-21 Dave Love <fx@gnu.org> 12000-05-21 Dave Love <fx@gnu.org>
2 2
3 * edmacro.el (edmacro-parse-keys): Return vector if any elements
4 are invalid characters.
5
3 * international/mule-util.el (detect-coding-with-priority): Use 6 * international/mule-util.el (detect-coding-with-priority): Use
4 mapc. Remove redundant lambda. 7 mapc. Remove redundant lambda.
5 8
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."
711 (setq res (edmacro-subseq res 2 -2))) 711 (setq res (edmacro-subseq res 2 -2)))
712 (if (and (not need-vector) 712 (if (and (not need-vector)
713 (loop for ch across res 713 (loop for ch across res
714 always (and (integerp ch) 714 always (and (char-valid-p ch)
715 (let ((ch2 (logand ch (lognot ?\M-\^@)))) 715 (let ((ch2 (logand ch (lognot ?\M-\^@))))
716 (and (>= ch2 0) (<= ch2 127)))))) 716 (and (>= ch2 0) (<= ch2 127))))))
717 (concat (loop for ch across res 717 (concat (loop for ch across res