Merge from emacs--devo--0

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-300

2 files changed, 5 insertions, 7 deletions

diff --git a/lisp/emulation/viper-init.el b/lisp/emulation/viper-init.el
index 539a561bb5b..c91886e0329 100644
--- a/lisp/emulation/viper-init.el
+++ b/lisp/emulation/viper-init.el
@@ -445,12 +445,10 @@ delete the text being replaced, as in standard Vi."
 (defvar viper-vi-state-cursor-color nil)
 
 (if (fboundp 'make-variable-frame-local)
-    (mapc 'make-variable-frame-local
-          '(viper-replace-overlay-cursor-color
-            viper-insert-state-cursor-color
-            viper-emacs-state-cursor-color
-            viper-vi-state-cursor-color)))
-
+    (dolist (v '(viper-replace-overlay-cursor-color
+                 viper-insert-state-cursor-color viper-emacs-state-cursor-color
+                 viper-vi-state-cursor-color))
+      (make-variable-frame-local v)))
 
 (viper-deflocalvar viper-replace-overlay nil "")
 (put 'viper-replace-overlay 'permanent-local t)
diff --git a/lisp/emulation/viper-util.el b/lisp/emulation/viper-util.el
index 87bf5235b81..78f54b3d63c 100644
--- a/lisp/emulation/viper-util.el
+++ b/lisp/emulation/viper-util.el
@@ -636,7 +636,7 @@
          (regexp (format "^[^;]*%s[ \t\n]*[a-zA-Z---_']*[ \t\n)]" var-name))
          (buf (find-file-noselect (substitute-in-file-name custom-file)))
         )
-    (message message)
+    (message "%s" (or message ""))
     (save-excursion
       (set-buffer buf)
       (goto-char (point-min))