diff options
| author | Michael Kifer <[email protected]> | 2007-01-23 20:56:57 +0000 |
|---|---|---|
| committer | Michael Kifer <[email protected]> | 2007-01-23 20:56:57 +0000 |
| commit | 279c800c553259979581bf880e4539f7b0b9f436 (patch) | |
| tree | 5fe08755310a5eba98394ee9fea8489f1f78e507 /lisp/ediff-util.el | |
| parent | 9671c13af86f8d34feb3bba19189114243f0d6fa (diff) | |
2007-01-23 Michael Kifer <[email protected]>
* 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.
Diffstat (limited to 'lisp/ediff-util.el')
| -rw-r--r-- | lisp/ediff-util.el | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/lisp/ediff-util.el b/lisp/ediff-util.el index 49d34f1b16..7483128b71 100644 --- a/lisp/ediff-util.el +++ b/lisp/ediff-util.el @@ -3346,13 +3346,14 @@ Without an argument, it saves customized diff argument, if available (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 @@ Mail anyway? (y or n) ") (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) |