Merge from emacs--devo--0

[gnu-emacs] / lisp / ruler-mode.el

diff --git a/lisp/ruler-mode.el b/lisp/ruler-mode.el
index 7deca94e67588ac16d43c7229d6463b54e7a9cd0..6b77a912dcff166504e898ba572efadea1fcebef 100644 (file)
--- a/lisp/ruler-mode.el
+++ b/lisp/ruler-mode.el
@@ -135,8 +135,7 @@ or remove a tab stop.  \\[ruler-mode-toggle-show-tab-stops] or
   "Ensure WIDGET value is a valid character value."
   (save-excursion
     (let ((value (widget-value widget)))
-      (if (char-valid-p value)
-          nil
+      (unless (characterp value)
         (widget-put widget :error
                     (format "Invalid character value: %S" value))
         widget))))
@@ -667,7 +666,8 @@ Optional argument PROPS specifies other text properties to apply."
          ;; Create an "clean" ruler.
          (ruler
           (propertize
-           (make-string w ruler-mode-basic-graduation-char)
+           (string-to-multibyte 
+           (make-string w ruler-mode-basic-graduation-char))
            'face 'ruler-mode-default
            'local-map ruler-mode-map
            'help-echo (cond