Mercurial > emacs
changeset 75389:11ae87f329da
2007-01-23 Michael Kifer <kifer@cs.stonybrook.edu>
* ediff-util.el (ediff-clone-buffer-for-region-comparison): change text
of message. Activate mark.
(ediff-activate-mark): set transient-mark-mode to t.
* ediff.el (ediff-regions-wordwise,ediff-regions-linewise): changed
docstrings.
* viper-keym.el (viper-insert-basic-map): deleted binding for S-TAB.
| author | Michael Kifer <kifer@cs.stonybrook.edu> |
|---|---|
| date | Tue, 23 Jan 2007 20:56:57 +0000 |
| parents | 3fe0e83f2c17 |
| children | 30ab6cb6bead |
| files | lisp/ChangeLog lisp/ediff-util.el lisp/ediff.el lisp/emulation/viper-keym.el |
| diffstat | 4 files changed, 20 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Tue Jan 23 13:19:36 2007 +0000 +++ b/lisp/ChangeLog Tue Jan 23 20:56:57 2007 +0000 @@ -1,3 +1,14 @@ +2007-01-23 Michael Kifer <kifer@cs.stonybrook.edu> + + * viper-keym.el (viper-insert-basic-map): deleted binding for S-TAB. + + * ediff-util.el (ediff-clone-buffer-for-region-comparison): change text + of message. Activate mark. + (ediff-activate-mark): set transient-mark-mode to t. + + * ediff.el (ediff-regions-wordwise,ediff-regions-linewise): changed + docstrings. + 2007-01-23 Martin Rudalics <rudalics@gmx.at> * help-fns.el (describe-variable): Don't suppress display of
--- a/lisp/ediff-util.el Tue Jan 23 13:19:36 2007 +0000 +++ b/lisp/ediff-util.el Tue Jan 23 20:56:57 2007 +0000 @@ -3346,13 +3346,14 @@ (setq wind (ediff-get-visible-buffer-window cloned-buff)) (select-window wind) (delete-other-windows) + (ediff-activate-mark) (split-window-vertically) (ediff-select-lowest-window) (setq other-wind (selected-window)) (with-temp-buffer (erase-buffer) (insert - (format "\n ******* Mark a region in buffer %s *******\n" + (format "\n ******* Mark a region in buffer %s (or confirm the existing one) *******\n" (buffer-name cloned-buff))) (insert (ediff-with-current-buffer buff @@ -4059,7 +4060,11 @@ (defun ediff-activate-mark () (ediff-cond-compile-for-xemacs-or-emacs (zmacs-activate-region) ; xemacs - (setq mark-active t) ; emacs + (progn + (make-local-variable 'transient-mark-mode) + (setq mark-active t + transient-mark-mode t) ; emacs + ) )) (cond ((fboundp 'nuke-selective-display)
--- a/lisp/ediff.el Tue Jan 23 13:19:36 2007 +0000 +++ b/lisp/ediff.el Tue Jan 23 20:56:57 2007 +0000 @@ -922,10 +922,7 @@ ;;;###autoload (defun ediff-regions-wordwise (buffer-A buffer-B &optional startup-hooks) "Run Ediff on a pair of regions in specified buffers. -Regions \(i.e., point and mark\) are assumed to be set in advance except -for the second region in the case both regions are from the same buffer. -In such a case the user is asked to interactively establish the second -region. +Regions \(i.e., point and mark\) can be set in advance or marked interactively. This function is effective only for relatively small regions, up to 200 lines. For large regions, use `ediff-regions-linewise'." (interactive @@ -966,10 +963,7 @@ ;;;###autoload (defun ediff-regions-linewise (buffer-A buffer-B &optional startup-hooks) "Run Ediff on a pair of regions in specified buffers. -Regions \(i.e., point and mark\) are assumed to be set in advance except -for the second region in the case both regions are from the same buffer. -In such a case the user is asked to interactively establish the second -region. +Regions \(i.e., point and mark\) can be set in advance or marked interactively. Each region is enlarged to contain full lines. This function is effective for large regions, over 100-200 lines. For small regions, use `ediff-regions-wordwise'."
--- a/lisp/emulation/viper-keym.el Tue Jan 23 13:19:36 2007 +0000 +++ b/lisp/emulation/viper-keym.el Tue Jan 23 20:56:57 2007 +0000 @@ -308,8 +308,6 @@ (define-key viper-insert-basic-map "\C-d" 'viper-backward-indent) (define-key viper-insert-basic-map "\C-w" 'viper-delete-backward-word) (define-key viper-insert-basic-map "\C-t" 'viper-forward-indent) -(define-key viper-insert-basic-map - (if viper-xemacs-p [(shift tab)] [S-tab]) 'viper-insert-tab) (define-key viper-insert-basic-map viper-quoted-insert-key 'quoted-insert) (define-key viper-insert-basic-map "\C-?" 'viper-del-backward-char-in-insert) (define-key viper-insert-basic-map [backspace] 'viper-del-backward-char-in-insert)