aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/lispref/frames.texi2
-rw-r--r--doc/misc/ediff.texi13
2 files changed, 7 insertions, 8 deletions
diff --git a/doc/lispref/frames.texi b/doc/lispref/frames.texi
index ad5d0fc6015..b961d687edd 100644
--- a/doc/lispref/frames.texi
+++ b/doc/lispref/frames.texi
@@ -503,7 +503,7 @@ Height | | | Height | | | Height
503In practice not all of the areas shown in the drawing will or may be 503In practice not all of the areas shown in the drawing will or may be
504present. The meaning of these areas is described below. 504present. The meaning of these areas is described below.
505 505
506@table @samp 506@table @asis
507@item Outer Frame 507@item Outer Frame
508@cindex outer frame 508@cindex outer frame
509@cindex outer edges 509@cindex outer edges
diff --git a/doc/misc/ediff.texi b/doc/misc/ediff.texi
index 746c4c829d2..cce8321d9eb 100644
--- a/doc/misc/ediff.texi
+++ b/doc/misc/ediff.texi
@@ -210,11 +210,11 @@ ancestors. Ediff selects only the files that are under version control.
210 210
211@item ediff-windows-wordwise 211@item ediff-windows-wordwise
212@findex ediff-windows-wordwise 212@findex ediff-windows-wordwise
213Compare windows word-by-word. 213Compare text visible in 2 windows word-by-word.
214 214
215@item ediff-windows-linewise 215@item ediff-windows-linewise
216@findex ediff-windows-linewise 216@findex ediff-windows-linewise
217Compare windows line-by-line. 217Compare text visible in 2 windows line-by-line.
218 218
219@item ediff-regions-wordwise 219@item ediff-regions-wordwise
220@findex ediff-regions-wordwise 220@findex ediff-regions-wordwise
@@ -373,13 +373,12 @@ The commands @code{ediff-windows-wordwise},
373@code{ediff-windows-linewise}, @code{ediff-regions-wordwise} and 373@code{ediff-windows-linewise}, @code{ediff-regions-wordwise} and
374@code{ediff-regions-linewise} do comparison on parts of existing Emacs 374@code{ediff-regions-linewise} do comparison on parts of existing Emacs
375buffers. The commands @code{ediff-windows-wordwise} and 375buffers. The commands @code{ediff-windows-wordwise} and
376@code{ediff-regions-wordwise} are intended for relatively small segments 376@code{ediff-regions-wordwise} could be slow on very large buffers,
377of buffers (e.g., up to 100 lines, depending on the speed of your machine),
378as they perform comparison on the basis of words rather than lines. 377as they perform comparison on the basis of words rather than lines.
379(Word-wise comparison of large chunks of text can be slow.) 378(Word-wise comparison of large chunks of text is relatively expensive.)
380 379
381To compare large regions, use @code{ediff-regions-linewise}. This 380To compare very large regions, use @code{ediff-regions-linewise}.
382command displays differences much like @code{ediff-files} and 381This command displays differences much like @code{ediff-files} and
383@code{ediff-buffers}. 382@code{ediff-buffers}.
384 383
385The functions @code{ediff-patch-file} and @code{ediff-patch-buffer} apply a 384The functions @code{ediff-patch-file} and @code{ediff-patch-buffer} apply a