Merge from emacs--devo--0

[gnu-emacs] / lisp / emacs-lisp / generic.el

diff --git a/lisp/emacs-lisp/generic.el b/lisp/emacs-lisp/generic.el
index add152adc4a8cd1471d6ce454da2ed8c8641c5db..08799822a91f374f8659633ccbcc5440e516b4ff 100644 (file)
--- a/lisp/emacs-lisp/generic.el
+++ b/lisp/emacs-lisp/generic.el
@@ -240,9 +240,9 @@ Some generic modes are defined in `generic-x.el'."
        (when (consp start)
          (setq end (cdr start))
          (setq start (car start)))
-       (when (char-valid-p start) (setq start (char-to-string start)))
+       (when (characterp start) (setq start (char-to-string start)))
        (cond
-        ((char-valid-p end)   (setq end (char-to-string end)))
+        ((characterp end)   (setq end (char-to-string end)))
         ((zerop (length end)) (setq end "\n")))
 
        ;; Setup the vars for `comment-region'