[Emacs-diffs] trunk r117197: .

[Reuben Thomas]

------------------------------------------------------------
revno: 117197
revision-id: address@hidden
parent: address@hidden
committer: Reuben Thomas <address@hidden>
branch nick: trunk
timestamp: Thu 2014-05-29 23:38:02 +0100
message:
  .
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/whitespace.el             
whitespace.el-20091113204419-o5vbwnq5f7feedwu-8268

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-05-29 03:54:37 +0000
+++ b/lisp/ChangeLog    2014-05-29 22:38:02 +0000
@@ -1,3 +1,7 @@
+2014-05-29  Reuben Thomas  <address@hidden>
+
+       * whitespace.el (whitespace-report): Simplify documentation.
+
 2014-05-29  Stefan Monnier  <address@hidden>
 
        * whitespace.el: Use font-lock-flush.  Minimize refontifications.

=== modified file 'lisp/whitespace.el'
--- a/lisp/whitespace.el        2014-05-29 03:54:37 +0000
+++ b/lisp/whitespace.el        2014-05-29 22:38:02 +0000
@@ -1737,21 +1737,14 @@
 
 Report if some of the following whitespace problems exist:
 
-* If `indent-tabs-mode' is non-nil:
-   empty               1. empty lines at beginning of buffer.
-   empty               2. empty lines at end of buffer.
-   trailing            3. SPACEs or TABs at end of line.
-   indentation         4. 8 or more SPACEs at beginning of line.
-   space-before-tab    5. SPACEs before TAB.
-   space-after-tab     6. 8 or more SPACEs after TAB.
-
-* If `indent-tabs-mode' is nil:
-   empty               1. empty lines at beginning of buffer.
-   empty               2. empty lines at end of buffer.
-   trailing            3. SPACEs or TABs at end of line.
-   indentation         4. TABS at beginning of line.
-   space-before-tab    5. SPACEs before TAB.
-   space-after-tab     6. 8 or more SPACEs after TAB.
+   empty               1. empty lines at beginning of buffer.
+   empty               2. empty lines at end of buffer.
+   trailing            3. SPACEs or TABs at end of line.
+   space-before-tab    4. SPACEs before TAB.
+   space-after-tab     5. 8 or more SPACEs after TAB.
+   indentation         6. If `indent-tabs-mode':
+                           8 or more SPACEs at beginning of line
+                           else: TABS at beginning of line.
 
 See `whitespace-style' for documentation.
 See also `whitespace-cleanup' and `whitespace-cleanup-region' for