Mercurial > emacs
comparison lisp/ediff-util.el @ 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 | e3694f1cb928 |
| children | 9355f9b7bbff eaa1a54ec3ee 95d0cdf160ea |
comparison
equal
deleted
inserted
replaced
| 75388:3fe0e83f2c17 | 75389:11ae87f329da |
|---|---|
| 3344 (setq ediff-temp-indirect-buffer t)) | 3344 (setq ediff-temp-indirect-buffer t)) |
| 3345 (pop-to-buffer cloned-buff) | 3345 (pop-to-buffer cloned-buff) |
| 3346 (setq wind (ediff-get-visible-buffer-window cloned-buff)) | 3346 (setq wind (ediff-get-visible-buffer-window cloned-buff)) |
| 3347 (select-window wind) | 3347 (select-window wind) |
| 3348 (delete-other-windows) | 3348 (delete-other-windows) |
| 3349 (ediff-activate-mark) | |
| 3349 (split-window-vertically) | 3350 (split-window-vertically) |
| 3350 (ediff-select-lowest-window) | 3351 (ediff-select-lowest-window) |
| 3351 (setq other-wind (selected-window)) | 3352 (setq other-wind (selected-window)) |
| 3352 (with-temp-buffer | 3353 (with-temp-buffer |
| 3353 (erase-buffer) | 3354 (erase-buffer) |
| 3354 (insert | 3355 (insert |
| 3355 (format "\n ******* Mark a region in buffer %s *******\n" | 3356 (format "\n ******* Mark a region in buffer %s (or confirm the existing one) *******\n" |
| 3356 (buffer-name cloned-buff))) | 3357 (buffer-name cloned-buff))) |
| 3357 (insert | 3358 (insert |
| 3358 (ediff-with-current-buffer buff | 3359 (ediff-with-current-buffer buff |
| 3359 (format "\n\t When done, type %s Use %s to abort\n " | 3360 (format "\n\t When done, type %s Use %s to abort\n " |
| 3360 (ediff-format-bindings-of 'exit-recursive-edit) | 3361 (ediff-format-bindings-of 'exit-recursive-edit) |
| 4057 (deactivate-mark) ; emacs | 4058 (deactivate-mark) ; emacs |
| 4058 )) | 4059 )) |
| 4059 (defun ediff-activate-mark () | 4060 (defun ediff-activate-mark () |
| 4060 (ediff-cond-compile-for-xemacs-or-emacs | 4061 (ediff-cond-compile-for-xemacs-or-emacs |
| 4061 (zmacs-activate-region) ; xemacs | 4062 (zmacs-activate-region) ; xemacs |
| 4062 (setq mark-active t) ; emacs | 4063 (progn |
| 4064 (make-local-variable 'transient-mark-mode) | |
| 4065 (setq mark-active t | |
| 4066 transient-mark-mode t) ; emacs | |
| 4067 ) | |
| 4063 )) | 4068 )) |
| 4064 | 4069 |
| 4065 (cond ((fboundp 'nuke-selective-display) | 4070 (cond ((fboundp 'nuke-selective-display) |
| 4066 ;; XEmacs has nuke-selective-display | 4071 ;; XEmacs has nuke-selective-display |
| 4067 (defalias 'ediff-nuke-selective-display 'nuke-selective-display)) | 4072 (defalias 'ediff-nuke-selective-display 'nuke-selective-display)) |