diff options
| author | Michael Kifer <kifer@cs.stonybrook.edu> | 2008-04-03 21:04:18 +0000 |
|---|---|---|
| committer | Michael Kifer <kifer@cs.stonybrook.edu> | 2008-04-03 21:04:18 +0000 |
| commit | 2ee00512e35d3bb872f6c7be39e0c3bb286ca2fe (patch) | |
| tree | b663c7b9e33383c90f34b03d97b79b815ec49e72 /lisp/emulation/viper-util.el | |
| parent | ece21937054981b66cfb0ead88ff463f172d8e77 (diff) | |
| download | emacs-2ee00512e35d3bb872f6c7be39e0c3bb286ca2fe.tar.gz emacs-2ee00512e35d3bb872f6c7be39e0c3bb286ca2fe.tar.bz2 emacs-2ee00512e35d3bb872f6c7be39e0c3bb286ca2fe.zip | |
2008-04-03 Michael Kifer <kifer@cs.stonybrook.edu>
* viper-macs.el (viper-read-fast-keysequence): use viper-read-event
instead of viper-read-key.
* viper.el (viper-mode): move the check for fundamental mode.
* viper-utils.el (viper-get-saved-cursor-color-in-replace-mode)
viper-get-saved-cursor-color-in-insert-mode): get rid of redundant
let-statements.
* viper*.el: replaced load with require in eval-when-compile.
Diffstat (limited to 'lisp/emulation/viper-util.el')
| -rw-r--r-- | lisp/emulation/viper-util.el | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/lisp/emulation/viper-util.el b/lisp/emulation/viper-util.el index c89823754fa..7410e05f7b4 100644 --- a/lisp/emulation/viper-util.el +++ b/lisp/emulation/viper-util.el @@ -209,10 +209,9 @@ Otherwise return the normal value." (if (featurep 'emacs) 'frame-parameter 'frame-property) (selected-frame) 'viper-saved-cursor-color-in-replace-mode) - (let ((ecolor (viper-frame-value viper-emacs-state-cursor-color))) - (or (and (eq viper-current-state 'emacs-mode) - ecolor) - (viper-frame-value viper-vi-state-cursor-color))))) + (or (and (eq viper-current-state 'emacs-mode) + (viper-frame-value viper-emacs-state-cursor-color)) + (viper-frame-value viper-vi-state-cursor-color)))) (defsubst viper-get-saved-cursor-color-in-insert-mode () (or @@ -220,10 +219,9 @@ Otherwise return the normal value." (if (featurep 'emacs) 'frame-parameter 'frame-property) (selected-frame) 'viper-saved-cursor-color-in-insert-mode) - (let ((ecolor (viper-frame-value viper-emacs-state-cursor-color))) - (or (and (eq viper-current-state 'emacs-mode) - ecolor) - (viper-frame-value viper-vi-state-cursor-color))))) + (or (and (eq viper-current-state 'emacs-mode) + (viper-frame-value viper-emacs-state-cursor-color)) + (viper-frame-value viper-vi-state-cursor-color)))) (defsubst viper-get-saved-cursor-color-in-emacs-mode () (or @@ -996,7 +994,7 @@ Otherwise return the normal value." ;; This function lets function-key-map convert key sequences into logical ;; keys. This does a better job than viper-read-event when it comes to kbd ;; macros, since it enables certain macros to be shared between X and TTY modes -;; by correctly mapping key sequences for Left/Right/... (one an ascii +;; by correctly mapping key sequences for Left/Right/... (on an ascii ;; terminal) into logical keys left, right, etc. (defun viper-read-key () (let ((overriding-local-map viper-overriding-map) @@ -1206,9 +1204,9 @@ Otherwise return the normal value." (defun viper-key-press-events-to-chars (events) (mapconcat (if (featurep 'xemacs) - (lambda (elt) (char-to-string (event-to-character elt))) ; xemacs - 'char-to-string ; emacs - ) + (lambda (elt) (char-to-string (event-to-character elt))) ; xemacs + 'char-to-string ; emacs + ) events "")) |