diff options
| author | Glenn Morris <rgm@gnu.org> | 2012-11-08 00:14:23 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2012-11-08 00:14:23 -0800 |
| commit | 26f596760dcbedc775d69ce829426b9d8dbd1870 (patch) | |
| tree | e0e8acef4058cbe18f626c1efb3fe46d99a59edf /doc | |
| parent | 7858872b755fd48d82f26a488351ac7ef8512f71 (diff) | |
| download | emacs-26f596760dcbedc775d69ce829426b9d8dbd1870.tar.gz | |
Document diff-remove-trailing-whitespace
* doc/emacs/files.texi (Diff Mode): Trailing whitespace updates.
* lisp/vc/diff-mode.el (diff-remove-trailing-whitespace): Doc fix.
* etc/NEWS: Related markup.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/emacs/ChangeLog | 4 | ||||
| -rw-r--r-- | doc/emacs/files.texi | 18 |
2 files changed, 17 insertions, 5 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index 7ffb22daf30..3893e3c6513 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,3 +1,7 @@ +2012-11-08 Glenn Morris <rgm@gnu.org> + + * files.texi (Diff Mode): Trailing whitespace updates. + 2012-11-07 Chong Yidong <cyd@gnu.org> * misc.texi (Terminal emulator): Document Term mode faces. diff --git a/doc/emacs/files.texi b/doc/emacs/files.texi index 36cd3658e2d..e2a85c6d138 100644 --- a/doc/emacs/files.texi +++ b/doc/emacs/files.texi @@ -1470,11 +1470,19 @@ name from the patch itself. This is useful for making log entries for functions that are deleted by the patch. @end table - By default, Diff mode highlights trailing whitespace on modified -lines, so that they are more obvious. This is done by enabling -Whitespace mode in the Diff buffer (@pxref{Useless Whitespace}). Diff -mode buffers are set up so that Whitespace mode avoids highlighting -trailing whitespace occurring in the diff context. +@c Trailing whitespace is NOT shown by default. +@c Emacs's dir-locals file enables this (for some reason). +@cindex trailing whitespace, in diffs +@findex diff-remove-trailing-whitespace + Diff mode has various features for dealing with trailing whitespace +on modified lines, since this is often an unintentional and unwanted +change. If you enable Whitespace mode in a Diff buffer, trailing +whitespace is highlighted (@pxref{Useless Whitespace}). The command +@kbd{M-x diff-remove-trailing-whitespace} searches for trailing +whitespace in the lines modified or added by a diff. If it finds any, +it tries to visit the associated file(s) and remove it. It does not +save the modifications, rather it lists any buffers that were modified +so you can decide for yourself what to do. @node Misc File Ops @section Miscellaneous File Operations |