Mercurial > emacs
comparison lisp/emulation/viper-cmd.el @ 93773:d7554c14325c
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.
| author | Michael Kifer <kifer@cs.stonybrook.edu> |
|---|---|
| date | Sun, 06 Apr 2008 19:26:02 +0000 |
| parents | 34417c118a39 |
| children | eb7b2376cae5 |
comparison
equal
deleted
inserted
replaced
| 93772:061a2121a7e8 | 93773:d7554c14325c |
|---|---|
| 3896 (search-forward string nil nil val) | 3896 (search-forward string nil nil val) |
| 3897 (search-backward string)) | 3897 (search-backward string)) |
| 3898 (if (not (equal start-point (point))) | 3898 (if (not (equal start-point (point))) |
| 3899 (push-mark start-point t))) | 3899 (push-mark start-point t))) |
| 3900 (search-failed | 3900 (search-failed |
| 3901 (if (and (not fail-if-not-found) viper-search-wrap-around-t) | 3901 (if (and (not fail-if-not-found) viper-search-wrap-around) |
| 3902 (progn | 3902 (progn |
| 3903 (message "Search wrapped around BOTTOM of buffer") | 3903 (message "Search wrapped around BOTTOM of buffer") |
| 3904 (goto-char (point-min)) | 3904 (goto-char (point-min)) |
| 3905 (viper-search string forward (cons 1 com) t start-point 'fail) | 3905 (viper-search string forward (cons 1 com) t start-point 'fail) |
| 3906 ;; don't wait in macros | 3906 ;; don't wait in macros |
| 3925 (re-search-backward string nil nil val) | 3925 (re-search-backward string nil nil val) |
| 3926 (search-backward string nil nil val)) | 3926 (search-backward string nil nil val)) |
| 3927 (if (not (equal start-point (point))) | 3927 (if (not (equal start-point (point))) |
| 3928 (push-mark start-point t))) | 3928 (push-mark start-point t))) |
| 3929 (search-failed | 3929 (search-failed |
| 3930 (if (and (not fail-if-not-found) viper-search-wrap-around-t) | 3930 (if (and (not fail-if-not-found) viper-search-wrap-around) |
| 3931 (progn | 3931 (progn |
| 3932 (message "Search wrapped around TOP of buffer") | 3932 (message "Search wrapped around TOP of buffer") |
| 3933 (goto-char (point-max)) | 3933 (goto-char (point-max)) |
| 3934 (viper-search string forward (cons 1 com) t start-point 'fail) | 3934 (viper-search string forward (cons 1 com) t start-point 'fail) |
| 3935 ;; don't wait in macros | 3935 ;; don't wait in macros |
| 4773 viper-toggle-key | 4773 viper-toggle-key |
| 4774 (if (viper-window-display-p) 'viper-iconify 'suspend-emacs)) | 4774 (if (viper-window-display-p) 'viper-iconify 'suspend-emacs)) |
| 4775 (setq viper-no-multiple-ESC t | 4775 (setq viper-no-multiple-ESC t |
| 4776 viper-re-search t | 4776 viper-re-search t |
| 4777 viper-vi-style-in-minibuffer t | 4777 viper-vi-style-in-minibuffer t |
| 4778 viper-search-wrap-around-t t | 4778 viper-search-wrap-around t |
| 4779 viper-electric-mode nil | 4779 viper-electric-mode nil |
| 4780 viper-want-emacs-keys-in-vi nil | 4780 viper-want-emacs-keys-in-vi nil |
| 4781 viper-want-emacs-keys-in-insert nil)) | 4781 viper-want-emacs-keys-in-insert nil)) |
| 4782 | 4782 |
| 4783 ((and (> viper-expert-level 1) (< viper-expert-level 5)) | 4783 ((and (> viper-expert-level 1) (< viper-expert-level 5)) |