diff options
author | Eli Zaretskii <eliz@gnu.org> | 2018-11-27 10:09:55 +0200 |
---|---|---|
committer | Eli Zaretskii <eliz@gnu.org> | 2018-11-27 10:09:55 +0200 |
commit | f0531b8e64250414baf1c0d2dde3fbfc55a748a0 (patch) | |
tree | 5b243f19adc24c9a76d8f65501cc46f5547bed06 /lisp/vc | |
parent | 2925ce5a7ec1424cfaea9f2f86bd3cab27832584 (diff) | |
download | emacs-f0531b8e64250414baf1c0d2dde3fbfc55a748a0.tar.gz emacs-f0531b8e64250414baf1c0d2dde3fbfc55a748a0.tar.bz2 emacs-f0531b8e64250414baf1c0d2dde3fbfc55a748a0.zip |
Improve documentation of Ediff wordwise commands
* lisp/vc/ediff.el (ediff-windows-wordwise)
(ediff-windows-linewise, ediff-regions-wordwise): Update and
clarify the doc strings.
* doc/misc/ediff.texi (Major Entry Points): Update and clarify
the documentation of 'ediff-windows-wordwise' and
'ediff-regions-wordwise'. See the discussion starting at
https://lists.gnu.org/archive/html/help-gnu-emacs/2018-11/msg00197.html
for the details.
Diffstat (limited to 'lisp/vc')
-rw-r--r-- | lisp/vc/ediff.el | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/lisp/vc/ediff.el b/lisp/vc/ediff.el index cd2b2c4e628..da7b0f12919 100644 --- a/lisp/vc/ediff.el +++ b/lisp/vc/ediff.el @@ -927,6 +927,7 @@ MERGE-AUTOSTORE-DIR is the directory in which to store merged files." ;;;###autoload (defun ediff-windows-wordwise (dumb-mode &optional wind-A wind-B startup-hooks) "Compare WIND-A and WIND-B, which are selected by clicking, wordwise. +This compares the portions of text visible in each of the two windows. With prefix argument, DUMB-MODE, or on a non-windowing display, works as follows: If WIND-A is nil, use selected window. @@ -940,6 +941,7 @@ arguments after setting up the Ediff buffers." ;;;###autoload (defun ediff-windows-linewise (dumb-mode &optional wind-A wind-B startup-hooks) "Compare WIND-A and WIND-B, which are selected by clicking, linewise. +This compares the portions of text visible in each of the two windows. With prefix argument, DUMB-MODE, or on a non-windowing display, works as follows: If WIND-A is nil, use selected window. @@ -950,7 +952,8 @@ arguments after setting up the Ediff buffers." (ediff-windows dumb-mode wind-A wind-B startup-hooks 'ediff-windows-linewise nil)) -;; Compare WIND-A and WIND-B, which are selected by clicking. +;; Compare visible portions of text in WIND-A and WIND-B, which are +;; selected by clicking. ;; With prefix argument, DUMB-MODE, or on a non-windowing display, ;; works as follows: ;; If WIND-A is nil, use selected window. @@ -991,8 +994,8 @@ arguments after setting up the Ediff buffers." "Run Ediff on a pair of regions in specified buffers. BUFFER-A and BUFFER-B are the buffers to be compared. 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'. +This function might be slow for large regions. If you find it slow, +use `ediff-regions-linewise' instead. STARTUP-HOOKS is a list of functions that Emacs calls without arguments after setting up the Ediff buffers." (interactive |