* emulation/viper-init.el (viper-restore-cursor-type):

* emulation/cua-base.el (cua--update-indications):
Replace default-cursor-type with (default-value 'cursor-type).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f69a3f287e339d969160c1c24dbf5ef7a86d9727..ada67dc7147c38382abff7cfc11a52cca1b6f28c 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2009-08-28  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+       * emulation/viper-init.el (viper-restore-cursor-type):
+       * emulation/cua-base.el (cua--update-indications):
+       Replace default-cursor-type with (default-value 'cursor-type).
+
        * mail/sendmail.el (mail-recover-1):
        * international/mule-diag.el (describe-current-coding-system-briefly)
        (describe-current-coding-system):

diff --git a/lisp/emulation/cua-base.el b/lisp/emulation/cua-base.el
index d74738900e413fe0f2d9ae2681952b9fde7635cc..a99a3f76250e8a8e00e333d36e0826008716d52c 100644 (file)
--- a/lisp/emulation/cua-base.el
+++ b/lisp/emulation/cua-base.el
@@ -1196,8 +1196,8 @@ If ARG is the atom `-', scroll upward by nearly full screen."
        (set-cursor-color color))
     (if (and type
             (symbolp type)
-            (not (eq type default-cursor-type)))
-       (setq default-cursor-type type))))
+            (not (eq type (default-value 'cursor-type))))
+       (setq-default cursor-type type))))
 
 
 ;;; Pre-command hook

diff --git a/lisp/emulation/viper-init.el b/lisp/emulation/viper-init.el
index 901a73fcecf58a64de7be17d03c488d8bd4f93d3..0227842b4501efdfde3a41d0998196a0d5e8f022 100644 (file)
--- a/lisp/emulation/viper-init.el
+++ b/lisp/emulation/viper-init.el
@@ -35,7 +35,6 @@
 (defvar default-input-method)
 (defvar describe-current-input-method-function)
 (defvar bar-cursor)
-(defvar default-cursor-type)
 (defvar cursor-type)
 ;; end pacifier
 
@@ -971,7 +970,7 @@ Should be set in `~/.viper' file."
   (condition-case nil
       (if (featurep 'xemacs)
          (set (make-local-variable 'bar-cursor) nil)
-       (setq cursor-type default-cursor-type))
+       (setq cursor-type (default-value 'cursor-type)))
     (error nil)))
 
 (defun viper-set-insert-cursor-type ()