(top-level): Use dolist rather than mapc in make-variable-frame-local call.

3 files changed, 13 insertions, 6 deletions

diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE
index b0965a01ba2..f96da325b75 100644
--- a/admin/FOR-RELEASE
+++ b/admin/FOR-RELEASE
@@ -107,6 +107,10 @@ http://lists.gnu.org/archive/html/emacs-devel/2007-10/msg02052.html
 ** Fix or document the shortcoming of easymenu and :suffix.
 http://lists.gnu.org/archive/html/emacs-devel/2007-11/msg01857.html
 
+** Fix problem with mode-name in SGML mode.
+If mode-name stays non-string, add NEWS entry and doc fix.
+http://lists.gnu.org/archive/html/emacs-devel/2007-11/msg02048.html
+
 * DOCUMENTATION
 
 ** Check the Emacs Tutorial.
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ec7ce254dae..4a5a423cebc 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2007-12-09  Glenn Morris  <rgm@gnu.org>
+
+        * emulation/viper-init.el (top-level): Use dolist rather than mapc
+        in make-variable-frame-local call.
+
 2007-12-08  Dan Nicolaescu  <dann@ics.uci.edu>
 
         * mail/hashcash.el (declare-function):
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)