[Emacs-diffs] emacs/lisp ChangeLog emulation/cua-base.el emul...

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        09/08/28 04:25:04

Modified files:
        lisp           : ChangeLog 
        lisp/emulation : cua-base.el viper-init.el 

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

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16036&r2=1.16037
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/emulation/cua-base.el?cvsroot=emacs&r1=1.100&r2=1.101
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/emulation/viper-init.el?cvsroot=emacs&r1=1.57&r2=1.58

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16036
retrieving revision 1.16037
diff -u -b -r1.16036 -r1.16037
--- ChangeLog   28 Aug 2009 04:21:14 -0000      1.16036
+++ ChangeLog   28 Aug 2009 04:24:59 -0000      1.16037
@@ -1,5 +1,9 @@
 2009-08-28  Stefan Monnier  <address@hidden>
 
+       * 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):

Index: emulation/cua-base.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/emulation/cua-base.el,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -b -r1.100 -r1.101
--- emulation/cua-base.el       5 Jan 2009 03:21:14 -0000       1.100
+++ emulation/cua-base.el       28 Aug 2009 04:25:03 -0000      1.101
@@ -1196,8 +1196,8 @@
        (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

Index: emulation/viper-init.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/emulation/viper-init.el,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -b -r1.57 -r1.58
--- emulation/viper-init.el     5 Jan 2009 03:21:21 -0000       1.57
+++ emulation/viper-init.el     28 Aug 2009 04:25:03 -0000      1.58
@@ -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 @@
   (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 ()