diff options
| author | Michael Kifer <kifer@cs.stonybrook.edu> | 2007-01-23 20:56:57 +0000 |
|---|---|---|
| committer | Michael Kifer <kifer@cs.stonybrook.edu> | 2007-01-23 20:56:57 +0000 |
| commit | 279c800c553259979581bf880e4539f7b0b9f436 (patch) | |
| tree | 5fe08755310a5eba98394ee9fea8489f1f78e507 /lisp/ediff.el | |
| parent | 9671c13af86f8d34feb3bba19189114243f0d6fa (diff) | |
| download | emacs-279c800c553259979581bf880e4539f7b0b9f436.tar.gz | |
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.
Diffstat (limited to 'lisp/ediff.el')
| -rw-r--r-- | lisp/ediff.el | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/lisp/ediff.el b/lisp/ediff.el index 312c2ee6a3c..c5f5c48f8da 100644 --- a/lisp/ediff.el +++ b/lisp/ediff.el @@ -922,10 +922,7 @@ If WIND-B is nil, use window next to WIND-A." ;;;###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 @@ lines. For large regions, use `ediff-regions-linewise'." ;;;###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'." |