diff options
author | Miles Bader <[email protected]> | 2007-12-16 05:08:49 +0000 |
---|---|---|
committer | Miles Bader <[email protected]> | 2007-12-16 05:08:49 +0000 |
commit | d29ee6b1a110cf5d170a10317a96acbbd4a1c68b (patch) | |
tree | 58f3c40766d8d56de7d2b026c29e198764d910aa /lisp/emulation | |
parent | 7e095e45a3f790e4608c88db9648d248e24901dc (diff) | |
parent | 47854a55680b5809811caf72f66ecbe8289c2855 (diff) |
Merge from emacs--devo--0
Revision: [email protected]/emacs--unicode--0--patch-300
Diffstat (limited to 'lisp/emulation')
-rw-r--r-- | lisp/emulation/viper-init.el | 10 | ||||
-rw-r--r-- | lisp/emulation/viper-util.el | 2 |
2 files changed, 5 insertions, 7 deletions
diff --git a/lisp/emulation/viper-init.el b/lisp/emulation/viper-init.el index 539a561bb5..c91886e032 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 87bf5235b8..78f54b3d63 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)) |