Mercurial > emacs
changeset 104665:dd47ce8e136c
* emulation/viper-init.el (viper-restore-cursor-type):
* emulation/cua-base.el (cua--update-indications):
Replace default-cursor-type with (default-value 'cursor-type).
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Fri, 28 Aug 2009 04:24:59 +0000 |
| parents | 50fdf250e26b |
| children | 6a7d6d80efae |
| files | lisp/ChangeLog lisp/emulation/cua-base.el lisp/emulation/viper-init.el |
| diffstat | 3 files changed, 7 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Fri Aug 28 04:21:14 2009 +0000 +++ b/lisp/ChangeLog Fri Aug 28 04:24:59 2009 +0000 @@ -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):
--- a/lisp/emulation/cua-base.el Fri Aug 28 04:21:14 2009 +0000 +++ b/lisp/emulation/cua-base.el Fri Aug 28 04:24:59 2009 +0000 @@ -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
--- a/lisp/emulation/viper-init.el Fri Aug 28 04:21:14 2009 +0000 +++ b/lisp/emulation/viper-init.el Fri Aug 28 04:24:59 2009 +0000 @@ -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 ()