mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-05 22:20:24 -08:00
Code Issues Projects Releases Wiki Activity

2008-04-03 Michael Kifer <kifer@cs.stonybrook.edu>

Browse source 
* 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.
This commit is contained in:
Michael Kifer 2008-04-03 21:04:18 +00:00
parent ece2193705
commit 2ee00512e3
7 changed files with 111 additions and 99 deletions
Download patch file Download diff file Expand all files Collapse all files

23
lisp/emulation/viper-cmd.el
View file

@ -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