diff options
| author | John Wiegley <johnw@newartisans.com> | 2015-12-29 21:39:08 -0800 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2015-12-29 21:39:08 -0800 |
| commit | ec0a80cc283badc7f7fd5ef78512dde6d34b1355 (patch) | |
| tree | 7190e0fb3d4aa06018d8cf997f06b806fb09a9c8 /doc/emacs/files.texi | |
| parent | d259328fb87db8cc67d52771efcfa653e52c5b71 (diff) | |
| parent | e823c34072bf045800d91e12c7ddb61fa23c6e30 (diff) | |
| download | emacs-25-merge.tar.gz | |
Merge emacs-25 into master (using imerge)emacs-25-merge
Diffstat (limited to 'doc/emacs/files.texi')
| -rw-r--r-- | doc/emacs/files.texi | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/doc/emacs/files.texi b/doc/emacs/files.texi index 5752d02fe85..4f7596e058c 100644 --- a/doc/emacs/files.texi +++ b/doc/emacs/files.texi @@ -1295,11 +1295,12 @@ would make to the file if you save the buffer. @findex compare-windows The command @kbd{M-x compare-windows} compares the text in the -current window with that in the next window. (For more information -about windows in Emacs, @ref{Windows}.) Comparison starts at point in -each window, after pushing each initial point value on the mark ring -in its respective buffer. Then it moves point forward in each window, -one character at a time, until it reaches characters that don't match. +current window with that in the window that was the selected window +before you selected the current one. (For more information about +windows in Emacs, @ref{Windows}.) Comparison starts at point in each +window, after pushing each initial point value on the mark ring in its +respective buffer. Then it moves point forward in each window, one +character at a time, until it reaches characters that don't match. Then the command exits. If point in the two windows is followed by non-matching text when |