1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-05 22:20:24 -08:00

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

* viper*.el (viper-search-wrap-around-t): replace with
	viper-search-wrap-around.

	* ediff*.el: replace 3-argument 'require' statements with 1-argument
	ones (wrapped in if's). For compatibility with the current stable
	version of XEmacs.
This commit is contained in:
Michael Kifer 2008-04-06 19:26:02 +00:00
parent 4dc2220833
commit a5254f3789
9 changed files with 33 additions and 17 deletions

View file

@ -3898,7 +3898,7 @@ Null string will repeat previous search."
(if (not (equal start-point (point)))
(push-mark start-point t)))
(search-failed
(if (and (not fail-if-not-found) viper-search-wrap-around-t)
(if (and (not fail-if-not-found) viper-search-wrap-around)
(progn
(message "Search wrapped around BOTTOM of buffer")
(goto-char (point-min))
@ -3927,7 +3927,7 @@ Null string will repeat previous search."
(if (not (equal start-point (point)))
(push-mark start-point t)))
(search-failed
(if (and (not fail-if-not-found) viper-search-wrap-around-t)
(if (and (not fail-if-not-found) viper-search-wrap-around)
(progn
(message "Search wrapped around TOP of buffer")
(goto-char (point-max))
@ -4775,7 +4775,7 @@ sensitive for VI-style look-and-feel."
(setq viper-no-multiple-ESC t
viper-re-search t
viper-vi-style-in-minibuffer t
viper-search-wrap-around-t t
viper-search-wrap-around t
viper-electric-mode nil
viper-want-emacs-keys-in-vi nil
viper-want-emacs-keys-in-insert nil))