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-cmd.el | |
| parent | ece21937054981b66cfb0ead88ff463f172d8e77 (diff) | |
| download | emacs-2ee00512e35d3bb872f6c7be39e0c3bb286ca2fe.tar.gz | |
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-cmd.el')
| -rw-r--r-- | lisp/emulation/viper-cmd.el | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/lisp/emulation/viper-cmd.el b/lisp/emulation/viper-cmd.el index a56c69e095b..26ae05c24fd 100644 --- a/lisp/emulation/viper-cmd.el +++ b/lisp/emulation/viper-cmd.el @@ -1839,13 +1839,13 @@ invokes the command before that, etc." (concat "`" (viper-array-to-string keys) "'") (viper-abbreviate-string (if (featurep 'xemacs) - (replace-in-string ; xemacs - (cond ((characterp text) (char-to-string text)) - ((stringp text) text) - (t "")) - "\n" "^J") - text ; emacs - ) + (replace-in-string ; xemacs + (cond ((characterp text) (char-to-string text)) + ((stringp text) text) + (t "")) + "\n" "^J") + text ; emacs + ) max-text-len " inserting `" "'" " .......")) )) @@ -2159,9 +2159,9 @@ To turn this feature off, set this variable to nil." (key-binding (setq key (read-key-sequence nil)))) (cond ((eq cmd 'self-insert-command) (if (featurep 'xemacs) - (insert (events-to-keys key)) ; xemacs - (insert key) ; emacs - )) + (insert (events-to-keys key)) ; xemacs + (insert key) ; emacs + )) ((memq cmd '(exit-minibuffer viper-exit-minibuffer)) nil) (t (command-execute cmd))) @@ -3450,7 +3450,8 @@ controlled by the sign of prefix numeric value." ;; (which is called from viper-search-forward/backward/next). If the value of ;; viper-search-scroll-threshold is negative - don't scroll. (defun viper-adjust-window () - (let ((win-height (if (featurep 'xemacs) (window-displayed-height) + (let ((win-height (if (featurep 'xemacs) + (window-displayed-height) (1- (window-height)))) ; adjust for modeline (pt (point)) at-top-p at-bottom-p |