diff options
| author | Michael Kifer <kifer@cs.stonybrook.edu> | 2009-08-15 05:57:08 +0000 |
|---|---|---|
| committer | Michael Kifer <kifer@cs.stonybrook.edu> | 2009-08-15 05:57:08 +0000 |
| commit | 68b962d42a9cc126759448484d23e10e2102d622 (patch) | |
| tree | ae4a046e1a8f5c540a61865f41476982f2446edc /lisp/emulation | |
| parent | 4989aff3705790be2ae7601de1fdf62b0b139b19 (diff) | |
| download | emacs-68b962d42a9cc126759448484d23e10e2102d622.tar.gz | |
2009-08-15 Michael Kifer <kifer@cs.stonybrook.edu>
* viper-cmd.el (viper-insert-isearch-string): new function.
(viper-if-string): redefine C-s in the minibuffer to insert the last
incremental search string.
* ediff-init.el (ediff-coding-system): use escape-quoted in case of
XEmacs.
* ediff-merg.el (ediff-merge-region-is-non-clash-to-skip,
ediff-merge-region-is-non-clash,
ediff-skip-merge-region-if-changed-from-default-p): use defun.
Also check if the job is really a merge job.
* ediff.el (ediff-current-file): new function.
Diffstat (limited to 'lisp/emulation')
| -rw-r--r-- | lisp/emulation/viper-cmd.el | 13 | ||||
| -rw-r--r-- | lisp/emulation/viper.el | 2 |
2 files changed, 12 insertions, 3 deletions
diff --git a/lisp/emulation/viper-cmd.el b/lisp/emulation/viper-cmd.el index 7a793b92d9a..83f268aa7ed 100644 --- a/lisp/emulation/viper-cmd.el +++ b/lisp/emulation/viper-cmd.el @@ -3685,15 +3685,24 @@ controlled by the sign of prefix numeric value." ;; searching +(defun viper-insert-isearch-string () + "Insert `isearch' last search string." + (interactive) + (when isearch-string (insert isearch-string))) + (defun viper-if-string (prompt) (if (memq viper-intermediate-command '(viper-command-argument viper-digit-argument viper-repeat)) (setq viper-this-command-keys (this-command-keys))) - (let ((s (viper-read-string-with-history + (let* ((keymap (let ((keymap (copy-keymap minibuffer-local-map))) + (define-key keymap [(control ?s)] 'viper-insert-isearch-string) + keymap)) + (s (viper-read-string-with-history prompt nil ; no initial 'viper-search-history - (car viper-search-history)))) + (car viper-search-history) + keymap))) (if (not (string= s "")) (setq viper-s-string s)))) diff --git a/lisp/emulation/viper.el b/lisp/emulation/viper.el index d2234fb22d9..1631b1aa6ba 100644 --- a/lisp/emulation/viper.el +++ b/lisp/emulation/viper.el @@ -14,7 +14,7 @@ ;; filed in the Emacs bug reporting system against this file, a copy ;; of the bug report be sent to the maintainer's email address. -(defconst viper-version "3.14 of November 22, 2008" +(defconst viper-version "3.14.1 of August 15, 2009" "The current version of Viper") ;; This file is part of GNU Emacs. |