diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2009-08-28 04:24:59 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2009-08-28 04:24:59 +0000 |
| commit | 009fdc2e72c00036815a06bd29c9dbf7add7a0c0 (patch) | |
| tree | 17c053ef58af71b5aa79887562223551ce9d1ccf /lisp | |
| parent | b56a5ae0fee0c641a3d874b4cce4c38813b941df (diff) | |
| download | emacs-009fdc2e72c00036815a06bd29c9dbf7add7a0c0.tar.gz | |
* emulation/viper-init.el (viper-restore-cursor-type):
* emulation/cua-base.el (cua--update-indications):
Replace default-cursor-type with (default-value 'cursor-type).
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/emulation/cua-base.el | 4 | ||||
| -rw-r--r-- | lisp/emulation/viper-init.el | 3 |
3 files changed, 7 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f69a3f287e3..ada67dc7147 100644 --- 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 d74738900e4..a99a3f76250 100644 --- 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 901a73fcecf..0227842b450 100644 --- 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 () |