*** empty log message ***

[bpt/emacs.git] / lisp / whitespace.el

diff --git a/lisp/whitespace.el b/lisp/whitespace.el
index 6a29eb2..293416c 100644 (file)
--- a/lisp/whitespace.el
+++ b/lisp/whitespace.el
@@ -6,25 +6,23 @@
 ;; Author: Vinicius Jose Latorre <viniciusjl@ig.com.br>
 ;; Maintainer: Vinicius Jose Latorre <viniciusjl@ig.com.br>
 ;; Keywords: data, wp
 ;; Author: Vinicius Jose Latorre <viniciusjl@ig.com.br>
 ;; Maintainer: Vinicius Jose Latorre <viniciusjl@ig.com.br>
 ;; Keywords: data, wp

-;; Version: 10.0
+;; Version: 11.2.2

 ;; X-URL: http://www.emacswiki.org/cgi-bin/wiki/ViniciusJoseLatorre
 
 ;; This file is part of GNU Emacs.
 
 ;; X-URL: http://www.emacswiki.org/cgi-bin/wiki/ViniciusJoseLatorre
 
 ;; This file is part of GNU Emacs.
 

-;; GNU Emacs is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published
-;; by the Free Software Foundation; either version 3, or (at your
-;; option) any later version.
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.

 
 

-;; GNU Emacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-;; General Public License for more details.
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.

 
 ;; You should have received a copy of the GNU General Public License
 
 ;; You should have received a copy of the GNU General Public License

-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.

 
 ;;; Commentary:
 
 
 ;;; Commentary:
 


@@ -46,8 +44,8 @@
 ;;   it provides a visual mark for characters, for example, at the end
 ;;   of line (?\xB6), at SPACEs (?\xB7) and at TABs (?\xBB).
 ;;
 ;;   it provides a visual mark for characters, for example, at the end
 ;;   of line (?\xB6), at SPACEs (?\xB7) and at TABs (?\xBB).
 ;;

-;; The `whitespace-style-mark' and `whitespace-style-color' variables
-;; are used to select which way should be used to visualize blanks.
+;; The `whitespace-style' variable selects which way blanks are
+;; visualized.

 ;;
 ;; Note that when whitespace is turned on, whitespace saves the
 ;; font-lock state, that is, if font-lock is on or off.  And
 ;;
 ;; Note that when whitespace is turned on, whitespace saves the
 ;; font-lock state, that is, if font-lock is on or off.  And


@@ -162,6 +160,12 @@
 ;;
 ;; There are also the following useful commands:
 ;;
 ;;
 ;; There are also the following useful commands:
 ;;

+;; `whitespace-newline-mode'
+;;    Toggle NEWLINE minor mode visualization ("nl" on modeline).
+;;
+;; `global-whitespace-newline-mode'
+;;    Toggle NEWLINE global minor mode visualization ("NL" on modeline).
+;;

 ;; `whitespace-report'
 ;;    Report some blank problems in buffer.
 ;;
 ;; `whitespace-report'
 ;;    Report some blank problems in buffer.
 ;;


@@ -178,41 +182,39 @@
 ;;
 ;; 1. empty lines at beginning of buffer.
 ;; 2. empty lines at end of buffer.
 ;;
 ;; 1. empty lines at beginning of buffer.
 ;; 2. empty lines at end of buffer.

-;;    If `whitespace-style-color' includes the value `empty', remove
-;;    all empty lines at beginning and/or end of buffer.
+;;    If `whitespace-style' includes the value `empty', remove all
+;;    empty lines at beginning and/or end of buffer.

 ;;
 ;; 3. 8 or more SPACEs at beginning of line.
 ;;
 ;; 3. 8 or more SPACEs at beginning of line.

-;;    If `whitespace-style-color' includes the value `indentation':
+;;    If `whitespace-style' includes the value `indentation':

 ;;    replace 8 or more SPACEs at beginning of line by TABs, if
 ;;    `indent-tabs-mode' is non-nil; otherwise, replace TABs by
 ;;    SPACEs.
 ;;    replace 8 or more SPACEs at beginning of line by TABs, if
 ;;    `indent-tabs-mode' is non-nil; otherwise, replace TABs by
 ;;    SPACEs.

-;;    If `whitespace-style-color' includes the value
-;;    `indentation::tab', replace 8 or more SPACEs at beginning of line
-;;    by TABs.
-;;    If `whitespace-style-color' includes the value
-;;    `indentation::space', replace TABs by SPACEs.
+;;    If `whitespace-style' includes the value `indentation::tab',
+;;    replace 8 or more SPACEs at beginning of line by TABs.
+;;    If `whitespace-style' includes the value `indentation::space',
+;;    replace TABs by SPACEs.

 ;;
 ;; 4. SPACEs before TAB.
 ;;
 ;; 4. SPACEs before TAB.

-;;    If `whitespace-style-color' includes the value
-;;    `space-before-tab': replace SPACEs by TABs, if
-;;    `indent-tabs-mode' is non-nil; otherwise, replace TABs by
-;;    SPACEs.
-;;    If `whitespace-style-color' includes the value
+;;    If `whitespace-style' includes the value `space-before-tab':
+;;    replace SPACEs by TABs, if `indent-tabs-mode' is non-nil;
+;;    otherwise, replace TABs by SPACEs.
+;;    If `whitespace-style' includes the value

 ;;    `space-before-tab::tab', replace SPACEs by TABs.
 ;;    `space-before-tab::tab', replace SPACEs by TABs.

-;;    If `whitespace-style-color' includes the value
+;;    If `whitespace-style' includes the value

 ;;    `space-before-tab::space', replace TABs by SPACEs.
 ;;
 ;; 5. SPACEs or TABs at end of line.
 ;;    `space-before-tab::space', replace TABs by SPACEs.
 ;;
 ;; 5. SPACEs or TABs at end of line.

-;;    If `whitespace-style-color' includes the value `trailing',
-;;    remove all SPACEs or TABs at end of line.
+;;    If `whitespace-style' includes the value `trailing', remove all
+;;    SPACEs or TABs at end of line.

 ;;
 ;; 6. 8 or more SPACEs after TAB.
 ;;
 ;; 6. 8 or more SPACEs after TAB.

-;;    If `whitespace-style-color' includes the value
-;;    `space-after-tab': replace SPACEs by TABs, if `indent-tabs-mode'
-;;    is non-nil; otherwise, replace TABs by SPACEs.
-;;    If `whitespace-style-color' includes the value
-;;    `space-after-tab::tab', replace SPACEs by TABs.
-;;    If `whitespace-style-color' includes the value
+;;    If `whitespace-style' includes the value `space-after-tab':
+;;    replace SPACEs by TABs, if `indent-tabs-mode' is non-nil;
+;;    otherwise, replace TABs by SPACEs.
+;;    If `whitespace-style' includes the value `space-after-tab::tab',
+;;    replace SPACEs by TABs.
+;;    If `whitespace-style' includes the value

 ;;    `space-after-tab::space', replace TABs by SPACEs.
 ;;
 ;;
 ;;    `space-after-tab::space', replace TABs by SPACEs.
 ;;
 ;;


@@ -237,11 +239,8 @@
 ;; Below it's shown a brief description of whitespace options, please,
 ;; see the options declaration in the code for a long documentation.
 ;;
 ;; Below it's shown a brief description of whitespace options, please,
 ;; see the options declaration in the code for a long documentation.
 ;;

-;; `whitespace-style-mark'     Specify which kind of blank is
-;;                             visualized via display table.
-;;
-;; `whitespace-style-color'    Specify which kind of blank is
-;;                             visualized via faces.
+;; `whitespace-style'          Specify which kind of blank is
+;;                             visualized.

 ;;
 ;; `whitespace-space'          Face used to visualize SPACE.
 ;;
 ;;
 ;; `whitespace-space'          Face used to visualize SPACE.
 ;;


@@ -303,18 +302,22 @@
 ;;                             turned on.
 ;;
 ;; `whitespace-action'         Specify which action is taken when a
 ;;                             turned on.
 ;;
 ;; `whitespace-action'         Specify which action is taken when a

-;;                             buffer is visited, killed or written.
+;;                             buffer is visited or written.

 ;;
 ;;
 ;; Acknowledgements
 ;; ----------------
 ;;
 ;;
 ;;
 ;; Acknowledgements
 ;; ----------------
 ;;

+;; Thanks to David Reitter <david.reitter@gmail.com> for suggesting a
+;; `whitespace-newline' initialization with low contrast relative to
+;; the background color.
+;;

 ;; Thanks to Stephen Deasey <sdeasey@gmail.com> for the
 ;; `indent-tabs-mode' usage suggestion.
 ;;
 ;; Thanks to Eric Cooper <ecc@cmu.edu> for the suggestion to have hook
 ;; Thanks to Stephen Deasey <sdeasey@gmail.com> for the
 ;; `indent-tabs-mode' usage suggestion.
 ;;
 ;; Thanks to Eric Cooper <ecc@cmu.edu> for the suggestion to have hook

-;; actions when buffer is written or killed as the original whitespace
-;; package had.
+;; actions when buffer is written as the original whitespace package
+;; had.

 ;;
 ;; Thanks to nschum (EmacsWiki) for the idea about highlight "long"
 ;; lines tail.  See EightyColumnRule (EmacsWiki).
 ;;
 ;; Thanks to nschum (EmacsWiki) for the idea about highlight "long"
 ;; lines tail.  See EightyColumnRule (EmacsWiki).


@@ -338,7 +341,7 @@
 ;; "long" lines.  See EightyColumnRule (EmacsWiki).
 ;;
 ;; Thanks to Yanghui Bian <yanghuibian@gmail.com> for indicating a new
 ;; "long" lines.  See EightyColumnRule (EmacsWiki).
 ;;
 ;; Thanks to Yanghui Bian <yanghuibian@gmail.com> for indicating a new

-;; newline character mapping.
+;; NEWLINE character mapping.

 ;;
 ;; Thanks to Pete Forman <pete.forman@westgeo.com> for indicating
 ;; whitespace-mode.el on XEmacs.
 ;;
 ;; Thanks to Pete Forman <pete.forman@westgeo.com> for indicating
 ;; whitespace-mode.el on XEmacs.


@@ -374,103 +377,91 @@
   :group 'data)
 
 
   :group 'data)
 
 

-(defcustom whitespace-style-mark '(space-mark tab-mark newline-mark)
-  "*Specify which kind of blank is visualized via display table.
-
-It's a list containing some or all of the following values:
-
-   space-mark  SPACEs and HARD SPACEs are visualized.
-
-   tab-mark    TABs are visualized.
-
-   newline-mark        NEWLINEs are visualized.
-
-Any other value is ignored.
-
-If nil, don't visualize TABs, (HARD) SPACEs and NEWLINEs via display
-table.
-
-See also `whitespace-display-mappings' for documentation."
-  :type '(repeat :tag "Kind of Blank Mark"
-                (choice :tag "Kind of Blank Mark"
-                        (const :tag "SPACEs and HARD SPACEs"
-                               space-mark)
-                        (const :tag "TABs" tab-mark)
-                        (const :tag "NEWLINEs" newline-mark)))
-  :group 'whitespace)
-
-
-(defcustom whitespace-style-color
+(defcustom whitespace-style

   '(tabs spaces trailing lines space-before-tab newline
   '(tabs spaces trailing lines space-before-tab newline

-        indentation empty space-after-tab)
-  "*Specify which kind of blank is visualized via faces.
+        indentation empty space-after-tab
+        space-mark tab-mark newline-mark)
+  "Specify which kind of blank is visualized.

 
 It's a list containing some or all of the following values:
 
 
 It's a list containing some or all of the following values:
 

-   trailing            trailing blanks are visualized.
+   trailing            trailing blanks are visualized via faces.

 
 

-   tabs                        TABs are visualized.
+   tabs                        TABs are visualized via faces.

 
 

-   spaces              SPACEs and HARD SPACEs are visualized.
+   spaces              SPACEs and HARD SPACEs are visualized via
+                       faces.

 
    lines               lines whose have columns beyond
 
    lines               lines whose have columns beyond

-                       `whitespace-line-column' are highlighted.
+                       `whitespace-line-column' are highlighted via
+                       faces .

                        Whole line is highlighted.
                        Whole line is highlighted.

-                       It has precedence over
-                       `lines-tail' (see below).
+                       It has precedence over `lines-tail' (see
+                       below).

 
    lines-tail          lines whose have columns beyond
 
    lines-tail          lines whose have columns beyond

-                       `whitespace-line-column' are highlighted.
+                       `whitespace-line-column' are highlighted via
+                       faces.

                        But only the part of line which goes
                        beyond `whitespace-line-column' column.
                        It has effect only if `lines' (see above)
                        But only the part of line which goes
                        beyond `whitespace-line-column' column.
                        It has effect only if `lines' (see above)

-                       is not present in `whitespace-style-color'.
+                       is not present in `whitespace-style'.

 
 

-   newline             NEWLINEs are visualized.
+   newline             NEWLINEs are visualized via faces.

 
    empty               empty lines at beginning and/or end of buffer
 
    empty               empty lines at beginning and/or end of buffer

-                       are visualized.
+                       are visualized via faces.

 
    indentation::tab    8 or more SPACEs at beginning of line are
 
    indentation::tab    8 or more SPACEs at beginning of line are

-                       visualized.
+                       visualized via faces.

 
 

-   indentation::space  TABs at beginning of line are visualized.
+   indentation::space  TABs at beginning of line are visualized via
+                       faces.

 
    indentation         8 or more SPACEs at beginning of line are
                        visualized, if `indent-tabs-mode' (which see)
                        is non-nil; otherwise, TABs at beginning of
 
    indentation         8 or more SPACEs at beginning of line are
                        visualized, if `indent-tabs-mode' (which see)
                        is non-nil; otherwise, TABs at beginning of

-                       line are visualized.
+                       line are visualized via faces.

 
    space-after-tab::tab                8 or more SPACEs after a TAB are
 
    space-after-tab::tab                8 or more SPACEs after a TAB are

-                               visualized.
+                               visualized via faces.

 
    space-after-tab::space      TABs are visualized when occurs 8 or
 
    space-after-tab::space      TABs are visualized when occurs 8 or

-                               more SPACEs after a TAB.
+                               more SPACEs after a TAB via faces.

 
    space-after-tab             8 or more SPACEs after a TAB are
                                visualized, if `indent-tabs-mode'
                                (which see) is non-nil; otherwise,
 
    space-after-tab             8 or more SPACEs after a TAB are
                                visualized, if `indent-tabs-mode'
                                (which see) is non-nil; otherwise,

-                               the TABs are visualized.
+                               the TABs are visualized via faces.

 
 

-   space-before-tab::tab       SPACEs before TAB are visualized.
+   space-before-tab::tab       SPACEs before TAB are visualized via
+                               faces.

 
    space-before-tab::space     TABs are visualized when occurs SPACEs
 
    space-before-tab::space     TABs are visualized when occurs SPACEs

-                               before TAB.
+                               before TAB via faces.

 
    space-before-tab            SPACEs before TAB are visualized, if
                                `indent-tabs-mode' (which see) is
                                non-nil; otherwise, the TABs are
 
    space-before-tab            SPACEs before TAB are visualized, if
                                `indent-tabs-mode' (which see) is
                                non-nil; otherwise, the TABs are

-                               visualized.
+                               visualized via faces.
+
+   space-mark          SPACEs and HARD SPACEs are visualized via
+                       display table.
+
+   tab-mark            TABs are visualized via display table.
+
+   newline-mark                NEWLINEs are visualized via display table.

 
 Any other value is ignored.
 
 
 Any other value is ignored.
 

-If nil, don't visualize TABs, (HARD) SPACEs and NEWLINEs via faces.
+If nil, don't visualize TABs, (HARD) SPACEs and NEWLINEs via faces and
+via display table.

 
 There is an evaluation order for some values, if some values are
 
 There is an evaluation order for some values, if some values are

-included in `whitespace-style-color' list.  For example, if
+included in `whitespace-style' list.  For example, if

 indentation, indentation::tab and/or indentation::space are
 indentation, indentation::tab and/or indentation::space are

-included in `whitespace-style-color' list.  The evaluation order
-for these values is:
+included in `whitespace-style' list.  The evaluation order for
+these values is:

 
  * For indentation:
    1. indentation
 
  * For indentation:
    1. indentation


@@ -488,30 +479,38 @@ for these values is:
    3. space-before-tab::space
 
 So, for example, if indentation and indentation::space are
    3. space-before-tab::space
 
 So, for example, if indentation and indentation::space are

-included in `whitespace-style-color' list, the indentation value
-is evaluated instead of indentation::space value."
-  :type '(repeat :tag "Kind of Blank Face"
+included in `whitespace-style' list, the indentation value is
+evaluated instead of indentation::space value.
+
+See also `whitespace-display-mappings' for documentation."
+  :type '(repeat :tag "Kind of Blank"

                 (choice :tag "Kind of Blank Face"
                 (choice :tag "Kind of Blank Face"

-                        (const :tag "Trailing TABs, SPACEs and HARD SPACEs"
+                        (const :tag "(Face) Trailing TABs, SPACEs and HARD SPACEs"

                                trailing)
                                trailing)

-                        (const :tag "SPACEs and HARD SPACEs" spaces)
-                        (const :tag "TABs" tabs)
-                        (const :tag "Lines" lines)
-                        (const :tag "SPACEs before TAB"
+                        (const :tag "(Face) SPACEs and HARD SPACEs"
+                               spaces)
+                        (const :tag "(Face) TABs" tabs)
+                        (const :tag "(Face) Lines" lines)
+                        (const :tag "(Face) SPACEs before TAB"

                                space-before-tab)
                                space-before-tab)

-                        (const :tag "NEWLINEs" newline)
-                        (const :tag "Indentation SPACEs" indentation)
-                        (const :tag "Empty Lines At BOB And/Or EOB"
+                        (const :tag "(Face) NEWLINEs" newline)
+                        (const :tag "(Face) Indentation SPACEs"
+                               indentation)
+                        (const :tag "(Face) Empty Lines At BOB And/Or EOB"

                                empty)
                                empty)

-                        (const :tag "SPACEs after TAB"
-                               space-after-tab)))
+                        (const :tag "(Face) SPACEs after TAB"
+                               space-after-tab)
+                        (const :tag "(Mark) SPACEs and HARD SPACEs"
+                               space-mark)
+                        (const :tag "(Mark) TABs" tab-mark)
+                        (const :tag "(Mark) NEWLINEs" newline-mark)))

   :group 'whitespace)
 
 
 (defcustom whitespace-space 'whitespace-space
   :group 'whitespace)
 
 
 (defcustom whitespace-space 'whitespace-space

-  "*Symbol face used to visualize SPACE.
+  "Symbol face used to visualize SPACE.

 
 

-Used when `whitespace-style-color' includes the value `spaces'."
+Used when `whitespace-style' includes the value `spaces'."

   :type 'face
   :group 'whitespace)
 
   :type 'face
   :group 'whitespace)
 


@@ -527,9 +526,9 @@ Used when `whitespace-style-color' includes the value `spaces'."
 
 
 (defcustom whitespace-hspace 'whitespace-hspace
 
 
 (defcustom whitespace-hspace 'whitespace-hspace

-  "*Symbol face used to visualize HARD SPACE.
+  "Symbol face used to visualize HARD SPACE.

 
 

-Used when `whitespace-style-color' includes the value `spaces'."
+Used when `whitespace-style' includes the value `spaces'."

   :type 'face
   :group 'whitespace)
 
   :type 'face
   :group 'whitespace)
 


@@ -545,9 +544,9 @@ Used when `whitespace-style-color' includes the value `spaces'."
 
 
 (defcustom whitespace-tab 'whitespace-tab
 
 
 (defcustom whitespace-tab 'whitespace-tab

-  "*Symbol face used to visualize TAB.
+  "Symbol face used to visualize TAB.

 
 

-Used when `whitespace-style-color' includes the value `tabs'."
+Used when `whitespace-style' includes the value `tabs'."

   :type 'face
   :group 'whitespace)
 
   :type 'face
   :group 'whitespace)
 


@@ -563,22 +562,22 @@ Used when `whitespace-style-color' includes the value `tabs'."
 
 
 (defcustom whitespace-newline 'whitespace-newline
 
 
 (defcustom whitespace-newline 'whitespace-newline

-  "*Symbol face used to visualize NEWLINE char mapping.
+  "Symbol face used to visualize NEWLINE char mapping.

 
 See `whitespace-display-mappings'.
 
 
 See `whitespace-display-mappings'.
 

-Used when `whitespace-style-mark' includes the values `newline-mark'
-and `whitespace-style-color' includes `newline'."
+Used when `whitespace-style' includes the values `newline-mark'
+and `newline'."

   :type 'face
   :group 'whitespace)
 
 
 (defface whitespace-newline
   '((((class color) (background dark))
   :type 'face
   :group 'whitespace)
 
 
 (defface whitespace-newline
   '((((class color) (background dark))

-     (:background "grey26" :foreground "aquamarine3" :bold t))
+     (:foreground "darkgray" :bold nil))

     (((class color) (background light))
     (((class color) (background light))

-     (:background "linen"  :foreground "aquamarine3" :bold t))
-    (t (:bold t :underline t)))
+     (:foreground "lightgray" :bold nil))
+    (t (:underline t :bold nil)))

   "Face used to visualize NEWLINE char mapping.
 
 See `whitespace-display-mappings'."
   "Face used to visualize NEWLINE char mapping.
 
 See `whitespace-display-mappings'."


@@ -586,9 +585,9 @@ See `whitespace-display-mappings'."
 
 
 (defcustom whitespace-trailing 'whitespace-trailing
 
 
 (defcustom whitespace-trailing 'whitespace-trailing

-  "*Symbol face used to visualize traling blanks.
+  "Symbol face used to visualize trailing blanks.

 
 

-Used when `whitespace-style-color' includes the value `trailing'."
+Used when `whitespace-style' includes the value `trailing'."

   :type 'face
   :group 'whitespace)
 
   :type 'face
   :group 'whitespace)
 


@@ -601,11 +600,11 @@ Used when `whitespace-style-color' includes the value `trailing'."
 
 
 (defcustom whitespace-line 'whitespace-line
 
 
 (defcustom whitespace-line 'whitespace-line

-  "*Symbol face used to visualize \"long\" lines.
+  "Symbol face used to visualize \"long\" lines.

 
 See `whitespace-line-column'.
 
 
 See `whitespace-line-column'.
 

-Used when `whitespace-style-color' includes the value `line'."
+Used when `whitespace-style' includes the value `line'."

   :type 'face
   :group 'whitespace)
 
   :type 'face
   :group 'whitespace)
 


@@ -620,9 +619,9 @@ See `whitespace-line-column'."
 
 
 (defcustom whitespace-space-before-tab 'whitespace-space-before-tab
 
 
 (defcustom whitespace-space-before-tab 'whitespace-space-before-tab

-  "*Symbol face used to visualize SPACEs before TAB.
+  "Symbol face used to visualize SPACEs before TAB.

 
 

-Used when `whitespace-style-color' includes the value `space-before-tab'."
+Used when `whitespace-style' includes the value `space-before-tab'."

   :type 'face
   :group 'whitespace)
 
   :type 'face
   :group 'whitespace)
 


@@ -635,9 +634,9 @@ Used when `whitespace-style-color' includes the value `space-before-tab'."
 
 
 (defcustom whitespace-indentation 'whitespace-indentation
 
 
 (defcustom whitespace-indentation 'whitespace-indentation

-  "*Symbol face used to visualize 8 or more SPACEs at beginning of line.
+  "Symbol face used to visualize 8 or more SPACEs at beginning of line.

 
 

-Used when `whitespace-style-color' includes the value `indentation'."
+Used when `whitespace-style' includes the value `indentation'."

   :type 'face
   :group 'whitespace)
 
   :type 'face
   :group 'whitespace)
 


@@ -650,9 +649,9 @@ Used when `whitespace-style-color' includes the value `indentation'."
 
 
 (defcustom whitespace-empty 'whitespace-empty
 
 
 (defcustom whitespace-empty 'whitespace-empty

-  "*Symbol face used to visualize empty lines at beginning and/or end of buffer.
+  "Symbol face used to visualize empty lines at beginning and/or end of buffer.

 
 

-Used when `whitespace-style-color' includes the value `empty'."
+Used when `whitespace-style' includes the value `empty'."

   :type 'face
   :group 'whitespace)
 
   :type 'face
   :group 'whitespace)
 


@@ -665,9 +664,9 @@ Used when `whitespace-style-color' includes the value `empty'."
 
 
 (defcustom whitespace-space-after-tab 'whitespace-space-after-tab
 
 
 (defcustom whitespace-space-after-tab 'whitespace-space-after-tab

-  "*Symbol face used to visualize 8 or more SPACEs after TAB.
+  "Symbol face used to visualize 8 or more SPACEs after TAB.

 
 

-Used when `whitespace-style-color' includes the value `space-after-tab'."
+Used when `whitespace-style' includes the value `space-after-tab'."

   :type 'face
   :group 'whitespace)
 
   :type 'face
   :group 'whitespace)
 


@@ -681,7 +680,7 @@ Used when `whitespace-style-color' includes the value `space-after-tab'."
 
 (defcustom whitespace-hspace-regexp
   "\\(\\(\xA0\\|\x8A0\\|\x920\\|\xE20\\|\xF20\\)+\\)"
 
 (defcustom whitespace-hspace-regexp
   "\\(\\(\xA0\\|\x8A0\\|\x920\\|\xE20\\|\xF20\\)+\\)"

-  "*Specify HARD SPACE characters regexp.
+  "Specify HARD SPACE characters regexp.

 
 If you're using `mule' package, there may be other characters besides:
 
 
 If you're using `mule' package, there may be other characters besides:
 


@@ -703,13 +702,13 @@ visualize only HARD SPACEs between TABs.
 NOTE: Enclose always by \\\\( and \\\\) the elements to highlight.
       Use exactly one pair of enclosing \\\\( and \\\\).
 
 NOTE: Enclose always by \\\\( and \\\\) the elements to highlight.
       Use exactly one pair of enclosing \\\\( and \\\\).
 

-Used when `whitespace-style-color' includes `spaces'."
+Used when `whitespace-style' includes `spaces'."

   :type '(regexp :tag "HARD SPACE Chars")
   :group 'whitespace)
 
 
 (defcustom whitespace-space-regexp "\\( +\\)"
   :type '(regexp :tag "HARD SPACE Chars")
   :group 'whitespace)
 
 
 (defcustom whitespace-space-regexp "\\( +\\)"

-  "*Specify SPACE characters regexp.
+  "Specify SPACE characters regexp.

 
 If you're using `mule' package, there may be other characters
 besides \" \" that should be considered SPACE.
 
 If you're using `mule' package, there may be other characters
 besides \" \" that should be considered SPACE.


@@ -725,13 +724,13 @@ visualize leading and/or trailing SPACEs.
 NOTE: Enclose always by \\\\( and \\\\) the elements to highlight.
       Use exactly one pair of enclosing \\\\( and \\\\).
 
 NOTE: Enclose always by \\\\( and \\\\) the elements to highlight.
       Use exactly one pair of enclosing \\\\( and \\\\).
 

-Used when `whitespace-style-color' includes `spaces'."
+Used when `whitespace-style' includes `spaces'."

   :type '(regexp :tag "SPACE Chars")
   :group 'whitespace)
 
 
 (defcustom whitespace-tab-regexp "\\(\t+\\)"
   :type '(regexp :tag "SPACE Chars")
   :group 'whitespace)
 
 
 (defcustom whitespace-tab-regexp "\\(\t+\\)"

-  "*Specify TAB characters regexp.
+  "Specify TAB characters regexp.

 
 If you're using `mule' package, there may be other characters
 besides \"\\t\" that should be considered TAB.
 
 If you're using `mule' package, there may be other characters
 besides \"\\t\" that should be considered TAB.


@@ -747,14 +746,14 @@ visualize leading and/or trailing TABs.
 NOTE: Enclose always by \\\\( and \\\\) the elements to highlight.
       Use exactly one pair of enclosing \\\\( and \\\\).
 
 NOTE: Enclose always by \\\\( and \\\\) the elements to highlight.
       Use exactly one pair of enclosing \\\\( and \\\\).
 

-Used when `whitespace-style-color' includes `tabs'."
+Used when `whitespace-style' includes `tabs'."

   :type '(regexp :tag "TAB Chars")
   :group 'whitespace)
 
 
 (defcustom whitespace-trailing-regexp
   :type '(regexp :tag "TAB Chars")
   :group 'whitespace)
 
 
 (defcustom whitespace-trailing-regexp

-  "\t\\| \\|\xA0\\|\x8A0\\|\x920\\|\xE20\\|\xF20"
-  "*Specify trailing characters regexp.
+  "\\(\\(\t\\| \\|\xA0\\|\x8A0\\|\x920\\|\xE20\\|\xF20\\)+\\)$"
+  "Specify trailing characters regexp.

 
 If you're using `mule' package, there may be other characters besides:
 
 
 If you're using `mule' package, there may be other characters besides:
 


@@ -763,17 +762,16 @@ If you're using `mule' package, there may be other characters besides:
 
 that should be considered blank.
 
 
 that should be considered blank.
 

-NOTE: DO NOT enclose by \\\\( and \\\\) the elements to highlight.
-      `whitespace-mode' surrounds this regexp by \"\\\\(\\\\(\" and
-      \"\\\\)+\\\\)$\".
+NOTE: Enclose always by \"\\\\(\" and \"\\\\)$\" the elements to highlight.
+      Use exactly one pair of enclosing elements above.

 
 

-Used when `whitespace-style-color' includes `trailing'."
+Used when `whitespace-style' includes `trailing'."

   :type '(regexp :tag "Trailing Chars")
   :group 'whitespace)
 
 
 (defcustom whitespace-space-before-tab-regexp "\\( +\\)\\(\t+\\)"
   :type '(regexp :tag "Trailing Chars")
   :group 'whitespace)
 
 
 (defcustom whitespace-space-before-tab-regexp "\\( +\\)\\(\t+\\)"

-  "*Specify SPACEs before TAB regexp.
+  "Specify SPACEs before TAB regexp.

 
 If you're using `mule' package, there may be other characters besides:
 
 
 If you're using `mule' package, there may be other characters besides:
 


@@ -782,7 +780,7 @@ If you're using `mule' package, there may be other characters besides:
 
 that should be considered blank.
 
 
 that should be considered blank.
 

-Used when `whitespace-style-color' includes `space-before-tab',
+Used when `whitespace-style' includes `space-before-tab',

 `space-before-tab::tab' or  `space-before-tab::space'."
   :type '(regexp :tag "SPACEs Before TAB")
   :group 'whitespace)
 `space-before-tab::tab' or  `space-before-tab::space'."
   :type '(regexp :tag "SPACEs Before TAB")
   :group 'whitespace)


@@ -791,7 +789,7 @@ Used when `whitespace-style-color' includes `space-before-tab',
 (defcustom whitespace-indentation-regexp
   '("^\t*\\(\\( \\{%d\\}\\)+\\)[^\n\t]"
     . "^ *\\(\t+\\)[^\n]")
 (defcustom whitespace-indentation-regexp
   '("^\t*\\(\\( \\{%d\\}\\)+\\)[^\n\t]"
     . "^ *\\(\t+\\)[^\n]")

-  "*Specify regexp for 8 or more SPACEs at beginning of line.
+  "Specify regexp for 8 or more SPACEs at beginning of line.

 
 It is a cons where the cons car is used for SPACEs visualization
 and the cons cdr is used for TABs visualization.
 
 It is a cons where the cons car is used for SPACEs visualization
 and the cons cdr is used for TABs visualization.


@@ -803,7 +801,7 @@ If you're using `mule' package, there may be other characters besides:
 
 that should be considered blank.
 
 
 that should be considered blank.
 

-Used when `whitespace-style-color' includes `indentation',
+Used when `whitespace-style' includes `indentation',

 `indentation::tab' or  `indentation::space'."
   :type '(cons (regexp :tag "Indentation SPACEs")
               (regexp :tag "Indentation TABs"))
 `indentation::tab' or  `indentation::space'."
   :type '(cons (regexp :tag "Indentation SPACEs")
               (regexp :tag "Indentation TABs"))


@@ -811,7 +809,7 @@ Used when `whitespace-style-color' includes `indentation',
 
 
 (defcustom whitespace-empty-at-bob-regexp "\\`\\(\\([ \t]*\n\\)+\\)"
 
 
 (defcustom whitespace-empty-at-bob-regexp "\\`\\(\\([ \t]*\n\\)+\\)"

-  "*Specify regexp for empty lines at beginning of buffer.
+  "Specify regexp for empty lines at beginning of buffer.

 
 If you're using `mule' package, there may be other characters besides:
 
 
 If you're using `mule' package, there may be other characters besides:
 


@@ -820,13 +818,13 @@ If you're using `mule' package, there may be other characters besides:
 
 that should be considered blank.
 
 
 that should be considered blank.
 

-Used when `whitespace-style-color' includes `empty'."
+Used when `whitespace-style' includes `empty'."

   :type '(regexp :tag "Empty Lines At Beginning Of Buffer")
   :group 'whitespace)
 
 
 (defcustom whitespace-empty-at-eob-regexp "^\\([ \t\n]+\\)\\'"
   :type '(regexp :tag "Empty Lines At Beginning Of Buffer")
   :group 'whitespace)
 
 
 (defcustom whitespace-empty-at-eob-regexp "^\\([ \t\n]+\\)\\'"

-  "*Specify regexp for empty lines at end of buffer.
+  "Specify regexp for empty lines at end of buffer.

 
 If you're using `mule' package, there may be other characters besides:
 
 
 If you're using `mule' package, there may be other characters besides:
 


@@ -835,7 +833,7 @@ If you're using `mule' package, there may be other characters besides:
 
 that should be considered blank.
 
 
 that should be considered blank.
 

-Used when `whitespace-style-color' includes `empty'."
+Used when `whitespace-style' includes `empty'."

   :type '(regexp :tag "Empty Lines At End Of Buffer")
   :group 'whitespace)
 
   :type '(regexp :tag "Empty Lines At End Of Buffer")
   :group 'whitespace)
 


@@ -843,7 +841,7 @@ Used when `whitespace-style-color' includes `empty'."
 (defcustom whitespace-space-after-tab-regexp
   '("\t+\\(\\( \\{%d\\}\\)+\\)"
     . "\\(\t+\\) +")
 (defcustom whitespace-space-after-tab-regexp
   '("\t+\\(\\( \\{%d\\}\\)+\\)"
     . "\\(\t+\\) +")

-  "*Specify regexp for 8 or more SPACEs after TAB.
+  "Specify regexp for 8 or more SPACEs after TAB.

 
 It is a cons where the cons car is used for SPACEs visualization
 and the cons cdr is used for TABs visualization.
 
 It is a cons where the cons car is used for SPACEs visualization
 and the cons cdr is used for TABs visualization.


@@ -855,16 +853,16 @@ If you're using `mule' package, there may be other characters besides:
 
 that should be considered blank.
 
 
 that should be considered blank.
 

-Used when `whitespace-style-color' includes `space-after-tab',
+Used when `whitespace-style' includes `space-after-tab',

 `space-after-tab::tab' or `space-after-tab::space'."
   :type '(regexp :tag "SPACEs After TAB")
   :group 'whitespace)
 
 
 (defcustom whitespace-line-column 80
 `space-after-tab::tab' or `space-after-tab::space'."
   :type '(regexp :tag "SPACEs After TAB")
   :group 'whitespace)
 
 
 (defcustom whitespace-line-column 80

-  "*Specify column beyond which the line is highlighted.
+  "Specify column beyond which the line is highlighted.

 
 

-Used when `whitespace-style-color' includes `lines' or `lines-tail'."
+Used when `whitespace-style' includes `lines' or `lines-tail'."

   :type '(integer :tag "Line Length")
   :group 'whitespace)
 
   :type '(integer :tag "Line Length")
   :group 'whitespace)
 


@@ -893,7 +891,7 @@ Used when `whitespace-style-color' includes `lines' or `lines-tail'."
     ;; If this is a problem for you, please, comment the line below.
     (tab-mark     ?\t    [?\xBB ?\t]   [?\\ ?\t])      ; tab - left quote mark
     )
     ;; If this is a problem for you, please, comment the line below.
     (tab-mark     ?\t    [?\xBB ?\t]   [?\\ ?\t])      ; tab - left quote mark
     )

-  "*Specify an alist of mappings for displaying characters.
+  "Specify an alist of mappings for displaying characters.

 
 Each element has the following form:
 
 
 Each element has the following form:
 


@@ -920,7 +918,8 @@ VECTOR      is a vector of characters to be displayed in place of CHAR.
 The NEWLINE character is displayed using the face given by
 `whitespace-newline' variable.
 
 The NEWLINE character is displayed using the face given by
 `whitespace-newline' variable.
 

-Used when `whitespace-style-mark' is non-nil."
+Used when `whitespace-style' includes `tab-mark', `space-mark' or
+`newline-mark'."

   :type '(repeat
          (list :tag "Character Mapping"
                (choice :tag "Char Kind"
   :type '(repeat
          (list :tag "Character Mapping"
                (choice :tag "Char Kind"


@@ -937,7 +936,7 @@ Used when `whitespace-style-mark' is non-nil."
 
 
 (defcustom whitespace-global-modes t
 
 
 (defcustom whitespace-global-modes t

-  "*Modes for which global `whitespace-mode' is automagically turned on.
+  "Modes for which global `whitespace-mode' is automagically turned on.

 
 Global `whitespace-mode' is controlled by the command
 `global-whitespace-mode'.
 
 Global `whitespace-mode' is controlled by the command
 `global-whitespace-mode'.


@@ -968,7 +967,7 @@ C++ modes only."
 
 
 (defcustom whitespace-action nil
 
 
 (defcustom whitespace-action nil

-  "*Specify which action is taken when a buffer is visited, killed or written.
+  "Specify which action is taken when a buffer is visited or written.

 
 It's a list containing some or all of the following values:
 
 
 It's a list containing some or all of the following values:
 


@@ -983,12 +982,16 @@ It's a list containing some or all of the following values:
                        when local whitespace is turned on.
 
    auto-cleanup                cleanup any bogus whitespace when buffer is
                        when local whitespace is turned on.
 
    auto-cleanup                cleanup any bogus whitespace when buffer is

-                       written or killed. 
+                       written.

                        See `whitespace-cleanup' and
                        `whitespace-cleanup-region'.
 
    abort-on-bogus      abort if there is any bogus whitespace and the
                        See `whitespace-cleanup' and
                        `whitespace-cleanup-region'.
 
    abort-on-bogus      abort if there is any bogus whitespace and the

-                       buffer is written or killed.
+                       buffer is written.
+
+   warn-if-read-only   give a warning if `cleanup' or `auto-cleanup'
+                       is included in `whitespace-action' and the
+                       buffer is read-only.

 
 Any other value is treated as nil."
   :type '(choice :tag "Actions"
 
 Any other value is treated as nil."
   :type '(choice :tag "Actions"


@@ -998,7 +1001,8 @@ Any other value is treated as nil."
                          (const :tag "Cleanup When On" cleanup)
                          (const :tag "Report On Bogus" report-on-bogus)
                          (const :tag "Auto Cleanup" auto-cleanup)
                          (const :tag "Cleanup When On" cleanup)
                          (const :tag "Report On Bogus" report-on-bogus)
                          (const :tag "Auto Cleanup" auto-cleanup)

-                         (const :tag "Abort On Bogus" abort-on-bogus))))
+                         (const :tag "Abort On Bogus" abort-on-bogus)
+                         (const :tag "Warn If Read-Only" warn-if-read-only))))

   :group 'whitespace)
 
 \f
   :group 'whitespace)
 
 \f


@@ -1013,7 +1017,10 @@ Any other value is treated as nil."
 If ARG is null, toggle whitespace visualization.
 If ARG is a number greater than zero, turn on visualization;
 otherwise, turn off visualization.
 If ARG is null, toggle whitespace visualization.
 If ARG is a number greater than zero, turn on visualization;
 otherwise, turn off visualization.

-Only useful with a windowing system."
+Only useful with a windowing system.
+
+See also `whitespace-style', `whitespace-newline' and
+`whitespace-display-mappings'."

   :lighter    " ws"
   :init-value nil
   :global     nil
   :lighter    " ws"
   :init-value nil
   :global     nil


@@ -1027,6 +1034,31 @@ Only useful with a windowing system."
    (t                                  ; whitespace-mode off
     (whitespace-turn-off))))
 
    (t                                  ; whitespace-mode off
     (whitespace-turn-off))))
 

+
+;;;###autoload
+(define-minor-mode whitespace-newline-mode
+  "Toggle NEWLINE minor mode visualization (\"nl\" on modeline).
+
+If ARG is null, toggle NEWLINE visualization.
+If ARG is a number greater than zero, turn on visualization;
+otherwise, turn off visualization.
+Only useful with a windowing system.
+
+Use `whitespace-newline-mode' only for NEWLINE visualization
+exclusively.  For other visualizations, including NEWLINE
+visualization together with (HARD) SPACEs and/or TABs, please,
+use `whitespace-mode'.
+
+See also `whitespace-newline' and `whitespace-display-mappings'."
+  :lighter    " nl"
+  :init-value nil
+  :global     nil
+  :group      'whitespace
+  (let ((whitespace-style '(newline-mark newline)))
+    (whitespace-mode whitespace-newline-mode)
+    ;; sync states (running a batch job)
+    (setq whitespace-newline-mode whitespace-mode)))
+

 \f
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;;; User commands - Global mode
 \f
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;;; User commands - Global mode


@@ -1039,7 +1071,10 @@ Only useful with a windowing system."
 If ARG is null, toggle whitespace visualization.
 If ARG is a number greater than zero, turn on visualization;
 otherwise, turn off visualization.
 If ARG is null, toggle whitespace visualization.
 If ARG is a number greater than zero, turn on visualization;
 otherwise, turn off visualization.

-Only useful with a windowing system."
+Only useful with a windowing system.
+
+See also `whitespace-style', `whitespace-newline' and
+`whitespace-display-mappings'."

   :lighter    " WS"
   :init-value nil
   :global     t
   :lighter    " WS"
   :init-value nil
   :global     t


@@ -1085,12 +1120,37 @@ Only useful with a windowing system."
        ;; Otherwise, turn on whitespace mode.
        (whitespace-turn-on)))))
 
        ;; Otherwise, turn on whitespace mode.
        (whitespace-turn-on)))))
 

+
+;;;###autoload
+(define-minor-mode global-whitespace-newline-mode
+  "Toggle NEWLINE global minor mode visualization (\"NL\" on modeline).
+
+If ARG is null, toggle NEWLINE visualization.
+If ARG is a number greater than zero, turn on visualization;
+otherwise, turn off visualization.
+Only useful with a windowing system.
+
+Use `global-whitespace-newline-mode' only for NEWLINE
+visualization exclusively.  For other visualizations, including
+NEWLINE visualization together with (HARD) SPACEs and/or TABs,
+please, use `global-whitespace-mode'.
+
+See also `whitespace-newline' and `whitespace-display-mappings'."
+  :lighter    " NL"
+  :init-value nil
+  :global     t
+  :group      'whitespace
+  (let ((whitespace-style '(newline-mark newline)))
+    (global-whitespace-mode global-whitespace-newline-mode)
+    ;; sync states (running a batch job)
+    (setq global-whitespace-newline-mode global-whitespace-mode)))
+

 \f
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;;; User commands - Toggle
 
 
 \f
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;;; User commands - Toggle
 
 

-(defconst whitespace-color-value-list
+(defconst whitespace-style-value-list

   '(tabs
     spaces
     trailing
   '(tabs
     spaces
     trailing


@@ -1107,21 +1167,16 @@ Only useful with a windowing system."
     space-before-tab
     space-before-tab::tab
     space-before-tab::space
     space-before-tab
     space-before-tab::tab
     space-before-tab::space

-    )
-  "List of valid `whitespace-style-color' values.")
-
-
-(defconst whitespace-mark-value-list
-  '(tab-mark
+    help-newline       ; value used by `whitespace-insert-option-mark'
+    tab-mark

     space-mark
     newline-mark
     )
     space-mark
     newline-mark
     )

-  "List of valid `whitespace-style-mark' values.")
+  "List of valid `whitespace-style' values.")

 
 
 (defconst whitespace-toggle-option-alist
 
 
 (defconst whitespace-toggle-option-alist

-  '( ;; `whitespace-color-value-list' values
-    (?t    . tabs)
+  '((?t    . tabs)

     (?s    . spaces)
     (?r    . trailing)
     (?l    . lines)
     (?s    . spaces)
     (?r    . trailing)
     (?l    . lines)


@@ -1137,13 +1192,10 @@ Only useful with a windowing system."
     (?\C-b . space-before-tab)
     (?B    . space-before-tab::tab)
     (?b    . space-before-tab::space)
     (?\C-b . space-before-tab)
     (?B    . space-before-tab::tab)
     (?b    . space-before-tab::space)

-    ;; `whitespace-mark-value-list' values

     (?T    . tab-mark)
     (?S    . space-mark)
     (?N    . newline-mark)
     (?T    . tab-mark)
     (?S    . space-mark)
     (?N    . newline-mark)

-    ;; restore values
-    (?x    . whitespace-style-color)
-    (?z    . whitespace-style-mark)
+    (?x    . whitespace-style)

     )
   "Alist of toggle options.
 
     )
   "Alist of toggle options.
 


@@ -1156,15 +1208,11 @@ Where:
 CHAR   is a char which the user will have to type.
 
 SYMBOL is a valid symbol associated with CHAR.
 CHAR   is a char which the user will have to type.
 
 SYMBOL is a valid symbol associated with CHAR.

-       See `whitespace-color-value-list' and
-       `whitespace-mark-value-list'.")
-
+       See `whitespace-style-value-list'.")

 
 

-(defvar whitespace-active-color nil
-  "Used to save locally `whitespace-style-color' value.")

 
 

-(defvar whitespace-active-mark nil
-  "Used to save locally `whitespace-style-mark' value.")
+(defvar whitespace-active-style nil
+  "Used to save locally `whitespace-style' value.")

 
 (defvar whitespace-indent-tabs-mode indent-tabs-mode
   "Used to save locally `indent-tabs-mode' value.")
 
 (defvar whitespace-indent-tabs-mode indent-tabs-mode
   "Used to save locally `indent-tabs-mode' value.")


@@ -1209,8 +1257,7 @@ Interactively, it reads one of the following chars:
    S   toggle SPACEs before TAB visualization
    N   toggle NEWLINE visualization
 
    S   toggle SPACEs before TAB visualization
    N   toggle NEWLINE visualization
 

-   x   restore `whitespace-style-color' value
-   z   restore `whitespace-style-mark' value
+   x   restore `whitespace-style' value

    ?   display brief help
 
 Non-interactively, ARG should be a symbol or a list of symbols.
    ?   display brief help
 
 Non-interactively, ARG should be a symbol or a list of symbols.


@@ -1237,30 +1284,20 @@ The valid symbols are:
    space-mark          toggle SPACEs before TAB visualization
    newline-mark                toggle NEWLINE visualization
 
    space-mark          toggle SPACEs before TAB visualization
    newline-mark                toggle NEWLINE visualization
 

-   whitespace-style-color      restore `whitespace-style-color' value
-   whitespace-style-mark       restore `whitespace-style-mark' value
+   whitespace-style    restore `whitespace-style' value

 
 Only useful with a windowing system.
 
 
 Only useful with a windowing system.
 

-See `whitespace-style-color', `whitespace-style-mark' and
-`indent-tabs-mode' for documentation."
+See `whitespace-style' and `indent-tabs-mode' for documentation."

   (interactive (whitespace-interactive-char t))
   (interactive (whitespace-interactive-char t))

-  (let ((whitespace-style-color
-        (whitespace-toggle-list
-         t arg whitespace-active-color whitespace-style-color
-         'whitespace-style-color whitespace-color-value-list))
-       (whitespace-style-mark
-        (whitespace-toggle-list
-         t arg whitespace-active-mark whitespace-style-mark
-         'whitespace-style-mark whitespace-mark-value-list)))
+  (let ((whitespace-style
+        (whitespace-toggle-list t arg whitespace-active-style)))

     (whitespace-mode 0)
     (whitespace-mode 1)))
 
 
     (whitespace-mode 0)
     (whitespace-mode 1)))
 
 

-(defvar whitespace-toggle-color nil
-  "Used to toggle the global `whitespace-style-color' value.")
-(defvar whitespace-toggle-mark  nil
-  "Used to toggle the global `whitespace-style-mark' value.")
+(defvar whitespace-toggle-style nil
+  "Used to toggle the global `whitespace-style' value.")

 
 
 ;;;###autoload
 
 
 ;;;###autoload


@@ -1299,8 +1336,7 @@ Interactively, it accepts one of the following chars:
    S   toggle SPACEs before TAB visualization
    N   toggle NEWLINE visualization
 
    S   toggle SPACEs before TAB visualization
    N   toggle NEWLINE visualization
 

-   x   restore `whitespace-style-color' value
-   z   restore `whitespace-style-mark' value
+   x   restore `whitespace-style' value

    ?   display brief help
 
 Non-interactively, ARG should be a symbol or a list of symbols.
    ?   display brief help
 
 Non-interactively, ARG should be a symbol or a list of symbols.


@@ -1327,24 +1363,15 @@ The valid symbols are:
    space-mark          toggle SPACEs before TAB visualization
    newline-mark                toggle NEWLINE visualization
 
    space-mark          toggle SPACEs before TAB visualization
    newline-mark                toggle NEWLINE visualization
 

-   whitespace-style-color      restore `whitespace-style-color' value
-   whitespace-style-mark       restore `whitespace-style-mark' value
+   whitespace-style    restore `whitespace-style' value

 
 Only useful with a windowing system.
 
 
 Only useful with a windowing system.
 

-See `whitespace-style-color', `whitespace-style-mark' and
-`indent-tabs-mode' for documentation."
+See `whitespace-style' and `indent-tabs-mode' for documentation."

   (interactive (whitespace-interactive-char nil))
   (interactive (whitespace-interactive-char nil))

-  (let ((whitespace-style-color
-        (whitespace-toggle-list
-         nil arg whitespace-toggle-color whitespace-style-color
-         'whitespace-style-color whitespace-color-value-list))
-       (whitespace-style-mark
-        (whitespace-toggle-list
-         nil arg whitespace-toggle-mark whitespace-style-mark
-         'whitespace-style-mark whitespace-mark-value-list)))
-    (setq whitespace-toggle-color whitespace-style-color
-         whitespace-toggle-mark  whitespace-style-mark)
+  (let ((whitespace-style
+        (whitespace-toggle-list nil arg whitespace-toggle-style)))
+    (setq whitespace-toggle-style whitespace-style)

     (global-whitespace-mode 0)
     (global-whitespace-mode 1)))
 
     (global-whitespace-mode 0)
     (global-whitespace-mode 1)))
 


@@ -1359,7 +1386,7 @@ See `whitespace-style-color', `whitespace-style-mark' and
 
 It usually applies to the whole buffer, but in transient mark
 mode when the mark is active, it applies to the region.  It also
 
 It usually applies to the whole buffer, but in transient mark
 mode when the mark is active, it applies to the region.  It also

-applies to the region when it is not in transiente mark mode, the
+applies to the region when it is not in transient mark mode, the

 mark is active and \\[universal-argument] was pressed just before
 calling `whitespace-cleanup' interactively.
 
 mark is active and \\[universal-argument] was pressed just before
 calling `whitespace-cleanup' interactively.
 


@@ -1369,62 +1396,66 @@ The problems cleaned up are:
 
 1. empty lines at beginning of buffer.
 2. empty lines at end of buffer.
 
 1. empty lines at beginning of buffer.
 2. empty lines at end of buffer.

-   If `whitespace-style-color' includes the value `empty', remove all
+   If `whitespace-style' includes the value `empty', remove all

    empty lines at beginning and/or end of buffer.
 
 3. 8 or more SPACEs at beginning of line.
    empty lines at beginning and/or end of buffer.
 
 3. 8 or more SPACEs at beginning of line.

-   If `whitespace-style-color' includes the value `indentation':
+   If `whitespace-style' includes the value `indentation':

    replace 8 or more SPACEs at beginning of line by TABs, if
    `indent-tabs-mode' is non-nil; otherwise, replace TABs by
    SPACEs.
    replace 8 or more SPACEs at beginning of line by TABs, if
    `indent-tabs-mode' is non-nil; otherwise, replace TABs by
    SPACEs.

-   If `whitespace-style-color' includes the value
-   `indentation::tab', replace 8 or more SPACEs at beginning of
-   line by TABs.
-   If `whitespace-style-color' includes the value
-   `indentation::space', replace TABs by SPACEs.
+   If `whitespace-style' includes the value `indentation::tab',
+   replace 8 or more SPACEs at beginning of line by TABs.
+   If `whitespace-style' includes the value `indentation::space',
+   replace TABs by SPACEs.

 
 4. SPACEs before TAB.
 
 4. SPACEs before TAB.

-   If `whitespace-style-color' includes the value `space-before-tab':
+   If `whitespace-style' includes the value `space-before-tab':

    replace SPACEs by TABs, if `indent-tabs-mode' is non-nil;
    otherwise, replace TABs by SPACEs.
    replace SPACEs by TABs, if `indent-tabs-mode' is non-nil;
    otherwise, replace TABs by SPACEs.

-   If `whitespace-style-color' includes the value
+   If `whitespace-style' includes the value

    `space-before-tab::tab', replace SPACEs by TABs.
    `space-before-tab::tab', replace SPACEs by TABs.

-   If `whitespace-style-color' includes the value
+   If `whitespace-style' includes the value

    `space-before-tab::space', replace TABs by SPACEs.
 
 5. SPACEs or TABs at end of line.
    `space-before-tab::space', replace TABs by SPACEs.
 
 5. SPACEs or TABs at end of line.

-   If `whitespace-style-color' includes the value `trailing', remove
+   If `whitespace-style' includes the value `trailing', remove

    all SPACEs or TABs at end of line.
 
 6. 8 or more SPACEs after TAB.
    all SPACEs or TABs at end of line.
 
 6. 8 or more SPACEs after TAB.

-   If `whitespace-style-color' includes the value `space-after-tab':
+   If `whitespace-style' includes the value `space-after-tab':

    replace SPACEs by TABs, if `indent-tabs-mode' is non-nil;
    otherwise, replace TABs by SPACEs.
    replace SPACEs by TABs, if `indent-tabs-mode' is non-nil;
    otherwise, replace TABs by SPACEs.

-   If `whitespace-style-color' includes the value
+   If `whitespace-style' includes the value

    `space-after-tab::tab', replace SPACEs by TABs.
    `space-after-tab::tab', replace SPACEs by TABs.

-   If `whitespace-style-color' includes the value
+   If `whitespace-style' includes the value

    `space-after-tab::space', replace TABs by SPACEs.
 
    `space-after-tab::space', replace TABs by SPACEs.
 

-See `whitespace-style-color', `indent-tabs-mode' and `tab-width'
-for documentation."
-  (interactive "@*")
-  (if (and (or transient-mark-mode
-              current-prefix-arg)
-          mark-active)
-      ;; region active
-      ;; PROBLEMs 1 and 2 are not handled in region
-      ;; PROBLEM 3: 8 or more SPACEs at bol
-      ;; PROBLEM 4: SPACEs before TAB
-      ;; PROBLEM 5: SPACEs or TABs at eol
-      ;; PROBLEM 6: 8 or more SPACEs after TAB
-      (whitespace-cleanup-region (region-beginning) (region-end))
-    ;; whole buffer
+See `whitespace-style', `indent-tabs-mode' and `tab-width' for
+documentation."
+  (interactive "@")
+  (cond
+   ;; read-only buffer
+   (buffer-read-only
+    (whitespace-warn-read-only "cleanup"))
+   ;; region active
+   ((and (or transient-mark-mode
+            current-prefix-arg)
+        mark-active)
+    ;; PROBLEMs 1 and 2 are not handled in region
+    ;; PROBLEM 3: 8 or more SPACEs at bol
+    ;; PROBLEM 4: SPACEs before TAB
+    ;; PROBLEM 5: SPACEs or TABs at eol
+    ;; PROBLEM 6: 8 or more SPACEs after TAB
+    (whitespace-cleanup-region (region-beginning) (region-end)))
+   ;; whole buffer
+   (t

     (save-excursion
       (save-match-data
        ;; PROBLEM 1: empty lines at bob
        ;; PROBLEM 2: empty lines at eob
        ;; ACTION: remove all empty lines at bob and/or eob
     (save-excursion
       (save-match-data
        ;; PROBLEM 1: empty lines at bob
        ;; PROBLEM 2: empty lines at eob
        ;; ACTION: remove all empty lines at bob and/or eob

-       (when (memq 'empty whitespace-style-color)
+       (when (memq 'empty whitespace-style)

          (let (overwrite-mode)         ; enforce no overwrite
            (goto-char (point-min))
            (when (re-search-forward
          (let (overwrite-mode)         ; enforce no overwrite
            (goto-char (point-min))
            (when (re-search-forward


@@ -1437,7 +1468,7 @@ for documentation."
     ;; PROBLEM 4: SPACEs before TAB
     ;; PROBLEM 5: SPACEs or TABs at eol
     ;; PROBLEM 6: 8 or more SPACEs after TAB
     ;; PROBLEM 4: SPACEs before TAB
     ;; PROBLEM 5: SPACEs or TABs at eol
     ;; PROBLEM 6: 8 or more SPACEs after TAB

-    (whitespace-cleanup-region (point-min) (point-max))))
+    (whitespace-cleanup-region (point-min) (point-max)))))

 
 
 ;;;###autoload
 
 
 ;;;###autoload


@@ -1447,119 +1478,122 @@ for documentation."
 The problems cleaned up are:
 
 1. 8 or more SPACEs at beginning of line.
 The problems cleaned up are:
 
 1. 8 or more SPACEs at beginning of line.

-   If `whitespace-style-color' includes the value `indentation':
+   If `whitespace-style' includes the value `indentation':

    replace 8 or more SPACEs at beginning of line by TABs, if
    `indent-tabs-mode' is non-nil; otherwise, replace TABs by
    SPACEs.
    replace 8 or more SPACEs at beginning of line by TABs, if
    `indent-tabs-mode' is non-nil; otherwise, replace TABs by
    SPACEs.

-   If `whitespace-style-color' includes the value
-   `indentation::tab', replace 8 or more SPACEs at beginning of
-   line by TABs.
-   If `whitespace-style-color' includes the value
-   `indentation::space', replace TABs by SPACEs.
+   If `whitespace-style' includes the value `indentation::tab',
+   replace 8 or more SPACEs at beginning of line by TABs.
+   If `whitespace-style' includes the value `indentation::space',
+   replace TABs by SPACEs.

 
 2. SPACEs before TAB.
 
 2. SPACEs before TAB.

-   If `whitespace-style-color' includes the value `space-before-tab':
+   If `whitespace-style' includes the value `space-before-tab':

    replace SPACEs by TABs, if `indent-tabs-mode' is non-nil;
    otherwise, replace TABs by SPACEs.
    replace SPACEs by TABs, if `indent-tabs-mode' is non-nil;
    otherwise, replace TABs by SPACEs.

-   If `whitespace-style-color' includes the value
+   If `whitespace-style' includes the value

    `space-before-tab::tab', replace SPACEs by TABs.
    `space-before-tab::tab', replace SPACEs by TABs.

-   If `whitespace-style-color' includes the value
+   If `whitespace-style' includes the value

    `space-before-tab::space', replace TABs by SPACEs.
 
 3. SPACEs or TABs at end of line.
    `space-before-tab::space', replace TABs by SPACEs.
 
 3. SPACEs or TABs at end of line.

-   If `whitespace-style-color' includes the value `trailing', remove
+   If `whitespace-style' includes the value `trailing', remove

    all SPACEs or TABs at end of line.
 
 4. 8 or more SPACEs after TAB.
    all SPACEs or TABs at end of line.
 
 4. 8 or more SPACEs after TAB.

-   If `whitespace-style-color' includes the value `space-after-tab':
+   If `whitespace-style' includes the value `space-after-tab':

    replace SPACEs by TABs, if `indent-tabs-mode' is non-nil;
    otherwise, replace TABs by SPACEs.
    replace SPACEs by TABs, if `indent-tabs-mode' is non-nil;
    otherwise, replace TABs by SPACEs.

-   If `whitespace-style-color' includes the value
+   If `whitespace-style' includes the value

    `space-after-tab::tab', replace SPACEs by TABs.
    `space-after-tab::tab', replace SPACEs by TABs.

-   If `whitespace-style-color' includes the value
+   If `whitespace-style' includes the value

    `space-after-tab::space', replace TABs by SPACEs.
 
    `space-after-tab::space', replace TABs by SPACEs.
 

-See `whitespace-style-color', `indent-tabs-mode' and `tab-width'
-for documentation."
-  (interactive "@*r")
-  (let ((rstart           (min start end))
-       (rend             (copy-marker (max start end)))
-       (indent-tabs-mode whitespace-indent-tabs-mode)
-       (tab-width        whitespace-tab-width)
-       overwrite-mode                  ; enforce no overwrite
-       tmp)
-    (save-excursion
-      (save-match-data
-       ;; PROBLEM 1: 8 or more SPACEs at bol
-       (cond
-        ;; ACTION: replace 8 or more SPACEs at bol by TABs, if
-        ;; `indent-tabs-mode' is non-nil; otherwise, replace TABs by
-        ;; SPACEs.
-        ((memq 'indentation whitespace-style-color)
-         (let ((regexp (whitespace-indentation-regexp)))
-           (goto-char rstart)
-           (while (re-search-forward regexp rend t)
-             (setq tmp (current-indentation))
-             (goto-char (match-beginning 0))
-             (delete-horizontal-space)
-             (unless (eolp)
-               (indent-to tmp)))))
-        ;; ACTION: replace 8 or more SPACEs at bol by TABs.
-        ((memq 'indentation::tab whitespace-style-color)
-         (whitespace-replace-action
-          'tabify rstart rend
-          (whitespace-indentation-regexp 'tab) 0))
-        ;; ACTION: replace TABs by SPACEs.
-        ((memq 'indentation::space whitespace-style-color)
-         (whitespace-replace-action
-          'untabify rstart rend
-          (whitespace-indentation-regexp 'space) 0)))
-       ;; PROBLEM 3: SPACEs or TABs at eol
-       ;; ACTION: remove all SPACEs or TABs at eol
-       (when (memq 'trailing whitespace-style-color)
-         (whitespace-replace-action
-          'delete-region rstart rend
-          (whitespace-trailing-regexp) 1))
-       ;; PROBLEM 4: 8 or more SPACEs after TAB
-       (cond
-        ;; ACTION: replace 8 or more SPACEs by TABs, if
-        ;; `indent-tabs-mode' is non-nil; otherwise, replace TABs by
-        ;; SPACEs.
-        ((memq 'space-after-tab whitespace-style-color)
-         (whitespace-replace-action
-          (if whitespace-indent-tabs-mode 'tabify 'untabify)
-          rstart rend (whitespace-space-after-tab-regexp) 1))
-        ;; ACTION: replace 8 or more SPACEs by TABs.
-        ((memq 'space-after-tab::tab whitespace-style-color)
-         (whitespace-replace-action
-          'tabify rstart rend
-          (whitespace-space-after-tab-regexp 'tab) 1))
-        ;; ACTION: replace TABs by SPACEs.
-        ((memq 'space-after-tab::space whitespace-style-color)
-         (whitespace-replace-action
-          'untabify rstart rend
-          (whitespace-space-after-tab-regexp 'space) 1)))
-       ;; PROBLEM 2: SPACEs before TAB
-       (cond
-        ;; ACTION: replace SPACEs before TAB by TABs, if
-        ;; `indent-tabs-mode' is non-nil; otherwise, replace TABs by
-        ;; SPACEs.
-        ((memq 'space-before-tab whitespace-style-color)
-         (whitespace-replace-action
-          (if whitespace-indent-tabs-mode 'tabify 'untabify)
-          rstart rend whitespace-space-before-tab-regexp
-          (if whitespace-indent-tabs-mode 1 2)))
-        ;; ACTION: replace SPACEs before TAB by TABs.
-        ((memq 'space-before-tab::tab whitespace-style-color)
-         (whitespace-replace-action
-          'tabify rstart rend
-          whitespace-space-before-tab-regexp 1))
-        ;; ACTION: replace TABs by SPACEs.
-        ((memq 'space-before-tab::space whitespace-style-color)
-         (whitespace-replace-action
-          'untabify rstart rend
-          whitespace-space-before-tab-regexp 2)))))
-    (set-marker rend nil)))            ; point marker to nowhere
+See `whitespace-style', `indent-tabs-mode' and `tab-width' for
+documentation."
+  (interactive "@r")
+  (if buffer-read-only
+      ;; read-only buffer
+      (whitespace-warn-read-only "cleanup region")
+    ;; non-read-only buffer
+    (let ((rstart           (min start end))
+         (rend             (copy-marker (max start end)))
+         (indent-tabs-mode whitespace-indent-tabs-mode)
+         (tab-width        whitespace-tab-width)
+         overwrite-mode                ; enforce no overwrite
+         tmp)
+      (save-excursion
+       (save-match-data
+         ;; PROBLEM 1: 8 or more SPACEs at bol
+         (cond
+          ;; ACTION: replace 8 or more SPACEs at bol by TABs, if
+          ;; `indent-tabs-mode' is non-nil; otherwise, replace TABs
+          ;; by SPACEs.
+          ((memq 'indentation whitespace-style)
+           (let ((regexp (whitespace-indentation-regexp)))
+             (goto-char rstart)
+             (while (re-search-forward regexp rend t)
+               (setq tmp (current-indentation))
+               (goto-char (match-beginning 0))
+               (delete-horizontal-space)
+               (unless (eolp)
+                 (indent-to tmp)))))
+          ;; ACTION: replace 8 or more SPACEs at bol by TABs.
+          ((memq 'indentation::tab whitespace-style)
+           (whitespace-replace-action
+            'tabify rstart rend
+            (whitespace-indentation-regexp 'tab) 0))
+          ;; ACTION: replace TABs by SPACEs.
+          ((memq 'indentation::space whitespace-style)
+           (whitespace-replace-action
+            'untabify rstart rend
+            (whitespace-indentation-regexp 'space) 0)))
+         ;; PROBLEM 3: SPACEs or TABs at eol
+         ;; ACTION: remove all SPACEs or TABs at eol
+         (when (memq 'trailing whitespace-style)
+           (whitespace-replace-action
+            'delete-region rstart rend
+            whitespace-trailing-regexp 1))
+         ;; PROBLEM 4: 8 or more SPACEs after TAB
+         (cond
+          ;; ACTION: replace 8 or more SPACEs by TABs, if
+          ;; `indent-tabs-mode' is non-nil; otherwise, replace TABs
+          ;; by SPACEs.
+          ((memq 'space-after-tab whitespace-style)
+           (whitespace-replace-action
+            (if whitespace-indent-tabs-mode 'tabify 'untabify)
+            rstart rend (whitespace-space-after-tab-regexp) 1))
+          ;; ACTION: replace 8 or more SPACEs by TABs.
+          ((memq 'space-after-tab::tab whitespace-style)
+           (whitespace-replace-action
+            'tabify rstart rend
+            (whitespace-space-after-tab-regexp 'tab) 1))
+          ;; ACTION: replace TABs by SPACEs.
+          ((memq 'space-after-tab::space whitespace-style)
+           (whitespace-replace-action
+            'untabify rstart rend
+            (whitespace-space-after-tab-regexp 'space) 1)))
+         ;; PROBLEM 2: SPACEs before TAB
+         (cond
+          ;; ACTION: replace SPACEs before TAB by TABs, if
+          ;; `indent-tabs-mode' is non-nil; otherwise, replace TABs
+          ;; by SPACEs.
+          ((memq 'space-before-tab whitespace-style)
+           (whitespace-replace-action
+            (if whitespace-indent-tabs-mode 'tabify 'untabify)
+            rstart rend whitespace-space-before-tab-regexp
+            (if whitespace-indent-tabs-mode 1 2)))
+          ;; ACTION: replace SPACEs before TAB by TABs.
+          ((memq 'space-before-tab::tab whitespace-style)
+           (whitespace-replace-action
+            'tabify rstart rend
+            whitespace-space-before-tab-regexp 1))
+          ;; ACTION: replace TABs by SPACEs.
+          ((memq 'space-before-tab::space whitespace-style)
+           (whitespace-replace-action
+            'untabify rstart rend
+            whitespace-space-before-tab-regexp 2)))))
+      (set-marker rend nil))))         ; point marker to nowhere

 
 
 (defun whitespace-replace-action (action rstart rend regexp index)
 
 
 (defun whitespace-replace-action (action rstart rend regexp index)


@@ -1578,11 +1612,6 @@ See also `tab-width'."
 ;;;; User command - report
 
 
 ;;;; User command - report
 
 

-(defun whitespace-trailing-regexp ()
-  "Make the `whitespace-trailing-regexp' regexp."
-  (concat "\\(\\(" whitespace-trailing-regexp "\\)+\\)$"))
-
-

 (defun whitespace-regexp (regexp &optional kind)
   "Return REGEXP depending on `whitespace-indent-tabs-mode'."
   (cond
 (defun whitespace-regexp (regexp &optional kind)
   "Return REGEXP depending on `whitespace-indent-tabs-mode'."
   (cond


@@ -1608,7 +1637,7 @@ See also `tab-width'."
   (list
    (cons 'empty                   whitespace-empty-at-bob-regexp)
    (cons 'empty                   whitespace-empty-at-eob-regexp)
   (list
    (cons 'empty                   whitespace-empty-at-bob-regexp)
    (cons 'empty                   whitespace-empty-at-eob-regexp)

-   (cons 'trailing                (whitespace-trailing-regexp))
+   (cons 'trailing                whitespace-trailing-regexp)

    (cons 'indentation             nil)
    (cons 'indentation::tab        nil)
    (cons 'indentation::space      nil)
    (cons 'indentation             nil)
    (cons 'indentation::tab        nil)
    (cons 'indentation::space      nil)


@@ -1685,7 +1714,7 @@ non-nil.
 
 If FORCE is non-nil or \\[universal-argument] was pressed just
 before calling `whitespace-report' interactively, it forces
 
 If FORCE is non-nil or \\[universal-argument] was pressed just
 before calling `whitespace-report' interactively, it forces

-`whitespace-style-color' to have:
+`whitespace-style' to have:

 
    empty
    trailing
 
    empty
    trailing


@@ -1714,8 +1743,7 @@ Report if some of the following whitespace problems exist:
    space-before-tab    5. SPACEs before TAB.
    space-after-tab     6. 8 or more SPACEs after TAB.
 
    space-before-tab    5. SPACEs before TAB.
    space-after-tab     6. 8 or more SPACEs after TAB.
 

-See `whitespace-style-color' and `whitespace-style-mark' for
-documentation.
+See `whitespace-style' for documentation.

 See also `whitespace-cleanup' and `whitespace-cleanup-region' for
 cleaning up these problems."
   (interactive (list current-prefix-arg))
 See also `whitespace-cleanup' and `whitespace-cleanup-region' for
 cleaning up these problems."
   (interactive (list current-prefix-arg))


@@ -1732,7 +1760,7 @@ non-nil.
 
 If FORCE is non-nil or \\[universal-argument] was pressed just
 before calling `whitespace-report-region' interactively, it
 
 If FORCE is non-nil or \\[universal-argument] was pressed just
 before calling `whitespace-report-region' interactively, it

-forces `whitespace-style-color' to have:
+forces `whitespace-style' to have:

 
    empty
    indentation
 
    empty
    indentation


@@ -1761,8 +1789,7 @@ Report if some of the following whitespace problems exist:
    space-before-tab    5. SPACEs before TAB.
    space-after-tab     6. 8 or more SPACEs after TAB.
 
    space-before-tab    5. SPACEs before TAB.
    space-after-tab     6. 8 or more SPACEs after TAB.
 

-See `whitespace-style-color' and `whitespace-style-mark' for
-documentation.
+See `whitespace-style' for documentation.

 See also `whitespace-cleanup' and `whitespace-cleanup-region' for
 cleaning up these problems."
   (interactive "r")
 See also `whitespace-cleanup' and `whitespace-cleanup-region' for
 cleaning up these problems."
   (interactive "r")


@@ -1776,8 +1803,7 @@ cleaning up these problems."
              (mapcar
               #'(lambda (option)
                   (when force
              (mapcar
               #'(lambda (option)
                   (when force

-                    (add-to-list 'whitespace-style-color
-                                 (car option)))
+                    (add-to-list 'whitespace-style (car option)))

                   (goto-char rstart)
                   (let ((regexp
                          (cond
                   (goto-char rstart)
                   (let ((regexp
                          (cond


@@ -1815,7 +1841,7 @@ cleaning up these problems."
              (dolist (option whitespace-report-list)
                (forward-line 1)
                (whitespace-mark-x
              (dolist (option whitespace-report-list)
                (forward-line 1)
                (whitespace-mark-x

-                27 (memq (car option) whitespace-style-color))
+                27 (memq (car option) whitespace-style))

                (whitespace-mark-x 7 (car bogus-list))
                (setq bogus-list (cdr bogus-list)))
              (forward-line 1)
                (whitespace-mark-x 7 (car bogus-list))
                (setq bogus-list (cdr bogus-list)))
              (forward-line 1)


@@ -1872,8 +1898,7 @@ cleaning up these problems."
  []  S - toggle SPACE and HARD SPACE visualization
  []  N - toggle NEWLINE visualization
 
  []  S - toggle SPACE and HARD SPACE visualization
  []  N - toggle NEWLINE visualization
 

-      x - restore `whitespace-style-color' value
-      z - restore `whitespace-style-mark' value
+      x - restore `whitespace-style' value

 
       ? - display this text\n\n"
   "Text for whitespace toggle options.")
 
       ? - display this text\n\n"
   "Text for whitespace toggle options.")


@@ -1898,13 +1923,16 @@ cleaning up these problems."
 
 (defun whitespace-insert-option-mark (the-list the-value)
   "Insert the option mark ('X' or ' ') in toggle options buffer."
 
 (defun whitespace-insert-option-mark (the-list the-value)
   "Insert the option mark ('X' or ' ') in toggle options buffer."

+  (goto-char (point-min))

   (forward-line 2)
   (dolist (sym  the-list)
   (forward-line 2)
   (dolist (sym  the-list)

-    (forward-line 1)
-    (whitespace-mark-x 2 (memq sym the-value))))
+    (if (eq sym 'help-newline)
+       (forward-line 2)
+      (forward-line 1)
+      (whitespace-mark-x 2 (memq sym the-value)))))

 
 
 
 

-(defun whitespace-help-on (chars style)
+(defun whitespace-help-on (style)

   "Display the whitespace toggle options."
   (unless (get-buffer whitespace-help-buffer-name)
     (delete-other-windows)
   "Display the whitespace toggle options."
   (unless (get-buffer whitespace-help-buffer-name)
     (delete-other-windows)


@@ -1913,11 +1941,8 @@ cleaning up these problems."
        (set-buffer buffer)
        (erase-buffer)
        (insert whitespace-help-text)
        (set-buffer buffer)
        (erase-buffer)
        (insert whitespace-help-text)

-       (goto-char (point-min))

        (whitespace-insert-option-mark
        (whitespace-insert-option-mark

-        whitespace-color-value-list chars)
-       (whitespace-insert-option-mark
-        whitespace-mark-value-list style)
+        whitespace-style-value-list style)

        (whitespace-display-window buffer)))))
 
 
        (whitespace-display-window buffer)))))
 
 


@@ -1981,20 +2006,16 @@ It accepts one of the following chars:
    S   toggle SPACE and HARD SPACE visualization
    N   toggle NEWLINE visualization
 
    S   toggle SPACE and HARD SPACE visualization
    N   toggle NEWLINE visualization
 

-   x   restore `whitespace-style-color' value
-   z   restore `whitespace-style-mark' value
+   x   restore `whitespace-style' value

    ?   display brief help
 
 See also `whitespace-toggle-option-alist'."
   (let* ((is-off (not (if local-p
                          whitespace-mode
                        global-whitespace-mode)))
    ?   display brief help
 
 See also `whitespace-toggle-option-alist'."
   (let* ((is-off (not (if local-p
                          whitespace-mode
                        global-whitespace-mode)))

-        (chars  (cond (is-off  whitespace-style-color) ; use default value
-                      (local-p whitespace-active-color)
-                      (t       whitespace-toggle-color)))
-        (style  (cond (is-off  whitespace-style-mark) ; use default value
-                      (local-p whitespace-active-mark)
-                      (t       whitespace-toggle-mark)))
+        (style  (cond (is-off  whitespace-style) ; use default value
+                      (local-p whitespace-active-style)
+                      (t       whitespace-toggle-style)))

         (prompt
          (format "Whitespace Toggle %s (type ? for further options)-"
                  (if local-p "Local" "Global")))
         (prompt
          (format "Whitespace Toggle %s (type ? for further options)-"
                  (if local-p "Local" "Global")))


@@ -2013,7 +2034,7 @@ See also `whitespace-toggle-option-alist'."
                          (assq ch whitespace-toggle-option-alist)))))
              ;; while body
              (if (eq ch ?\?)
                          (assq ch whitespace-toggle-option-alist)))))
              ;; while body
              (if (eq ch ?\?)

-                 (whitespace-help-on chars style)
+                 (whitespace-help-on style)

                (ding)))
            (whitespace-help-off)
            (message " "))              ; clean echo area
                (ding)))
            (whitespace-help-off)
            (message " "))              ; clean echo area


@@ -2024,8 +2045,7 @@ See also `whitespace-toggle-option-alist'."
     (list sym)))                       ; return the apropriate symbol
 
 
     (list sym)))                       ; return the apropriate symbol
 
 

-(defun whitespace-toggle-list (local-p arg the-list default-list
-                                      sym-restore sym-list)
+(defun whitespace-toggle-list (local-p arg the-list)

   "Toggle options in THE-LIST based on list ARG.
 
 If LOCAL-P is non-nil, it uses a local context; otherwise, it
   "Toggle options in THE-LIST based on list ARG.
 
 If LOCAL-P is non-nil, it uses a local context; otherwise, it


@@ -2034,73 +2054,87 @@ uses a global context.
 ARG is a list of options to be toggled.
 
 THE-LIST is a list of options.  This list will be toggled and the
 ARG is a list of options to be toggled.
 
 THE-LIST is a list of options.  This list will be toggled and the

-resultant list will be returned.
-
-DEFAULT-LIST is the default list of options.  It is used to
-restore the options in THE-LIST.
-
-SYM-RESTORE is the symbol which indicates to restore the options
-in THE-LIST.
-
-SYM-LIST is a list of valid options, used to check if the ARG's
-options are valid."
+resultant list will be returned."

   (unless (if local-p whitespace-mode global-whitespace-mode)
   (unless (if local-p whitespace-mode global-whitespace-mode)

-    (setq the-list default-list))
+    (setq the-list whitespace-style))

   (setq the-list (copy-sequence the-list)) ; keep original list
   (dolist (sym (if (listp arg) arg (list arg)))
     (cond
   (setq the-list (copy-sequence the-list)) ; keep original list
   (dolist (sym (if (listp arg) arg (list arg)))
     (cond

+     ;; ignore help value
+     ((eq sym 'help-newline))

      ;; restore default values
      ;; restore default values

-     ((eq sym sym-restore)
-      (setq the-list default-list))
+     ((eq sym 'whitespace-style)
+      (setq the-list whitespace-style))

      ;; toggle valid values
      ;; toggle valid values

-     ((memq sym sym-list)
+     ((memq sym whitespace-style-value-list)

       (setq the-list (if (memq sym the-list)
                         (delq sym the-list)
                       (cons sym the-list))))))
   the-list)
 
 
       (setq the-list (if (memq sym the-list)
                         (delq sym the-list)
                       (cons sym the-list))))))
   the-list)
 
 

+(defvar whitespace-display-table nil
+  "Used to save a local display table.")
+
+(defvar whitespace-display-table-was-local nil
+  "Used to remember whether a buffer initially had a local display table.")
+
+

 (defun whitespace-turn-on ()
   "Turn on whitespace visualization."
   ;; prepare local hooks
 (defun whitespace-turn-on ()
   "Turn on whitespace visualization."
   ;; prepare local hooks

-  (whitespace-add-local-hook)
+  (add-hook 'write-file-functions 'whitespace-write-file-hook nil t)

   ;; create whitespace local buffer environment
   (set (make-local-variable 'whitespace-font-lock-mode) nil)
   (set (make-local-variable 'whitespace-font-lock) nil)
   (set (make-local-variable 'whitespace-font-lock-keywords) nil)
   (set (make-local-variable 'whitespace-display-table) nil)
   (set (make-local-variable 'whitespace-display-table-was-local) nil)
   ;; create whitespace local buffer environment
   (set (make-local-variable 'whitespace-font-lock-mode) nil)
   (set (make-local-variable 'whitespace-font-lock) nil)
   (set (make-local-variable 'whitespace-font-lock-keywords) nil)
   (set (make-local-variable 'whitespace-display-table) nil)
   (set (make-local-variable 'whitespace-display-table-was-local) nil)

-  (set (make-local-variable 'whitespace-active-mark)
-       (if (listp whitespace-style-mark)
-          whitespace-style-mark
-        (list whitespace-style-mark)))
-  (set (make-local-variable 'whitespace-active-color)
-       (if (listp whitespace-style-color)
-          whitespace-style-color
-        (list whitespace-style-color)))
+  (set (make-local-variable 'whitespace-active-style)
+       (if (listp whitespace-style)
+          whitespace-style
+        (list whitespace-style)))

   (set (make-local-variable 'whitespace-indent-tabs-mode)
        indent-tabs-mode)
   (set (make-local-variable 'whitespace-tab-width)
        tab-width)
   ;; turn on whitespace
   (set (make-local-variable 'whitespace-indent-tabs-mode)
        indent-tabs-mode)
   (set (make-local-variable 'whitespace-tab-width)
        tab-width)
   ;; turn on whitespace

-  (when whitespace-active-color
-    (whitespace-color-on))
-  (when whitespace-active-mark
+  (when whitespace-active-style
+    (whitespace-color-on)

     (whitespace-display-char-on)))
 
 
 (defun whitespace-turn-off ()
   "Turn off whitespace visualization."
     (whitespace-display-char-on)))
 
 
 (defun whitespace-turn-off ()
   "Turn off whitespace visualization."

-  (whitespace-remove-local-hook)
-  (when whitespace-active-color
-    (whitespace-color-off))
-  (when whitespace-active-mark
+  (remove-hook 'write-file-functions 'whitespace-write-file-hook t)
+  (when whitespace-active-style
+    (whitespace-color-off)

     (whitespace-display-char-off)))
 
 
     (whitespace-display-char-off)))
 
 

+(defun whitespace-style-face-p ()
+  "Return t if there is some visualization via face."
+  (or (memq 'tabs                    whitespace-active-style)
+      (memq 'spaces                  whitespace-active-style)
+      (memq 'trailing                whitespace-active-style)
+      (memq 'lines                   whitespace-active-style)
+      (memq 'lines-tail              whitespace-active-style)
+      (memq 'newline                 whitespace-active-style)
+      (memq 'empty                   whitespace-active-style)
+      (memq 'indentation             whitespace-active-style)
+      (memq 'indentation::tab        whitespace-active-style)
+      (memq 'indentation::space      whitespace-active-style)
+      (memq 'space-after-tab         whitespace-active-style)
+      (memq 'space-after-tab::tab    whitespace-active-style)
+      (memq 'space-after-tab::space  whitespace-active-style)
+      (memq 'space-before-tab        whitespace-active-style)
+      (memq 'space-before-tab::tab   whitespace-active-style)
+      (memq 'space-before-tab::space whitespace-active-style)))
+
+

 (defun whitespace-color-on ()
   "Turn on color visualization."
 (defun whitespace-color-on ()
   "Turn on color visualization."

-  (when whitespace-active-color
+  (when (whitespace-style-face-p)

     (unless whitespace-font-lock
       (setq whitespace-font-lock t
            whitespace-font-lock-keywords
     (unless whitespace-font-lock
       (setq whitespace-font-lock t
            whitespace-font-lock-keywords


@@ -2110,7 +2144,7 @@ options are valid."
         font-lock-mode)
     (font-lock-mode 0)
     ;; add whitespace-mode color into font lock
         font-lock-mode)
     (font-lock-mode 0)
     ;; add whitespace-mode color into font lock

-    (when (memq 'spaces whitespace-active-color)
+    (when (memq 'spaces whitespace-active-style)

       (font-lock-add-keywords
        nil
        (list
       (font-lock-add-keywords
        nil
        (list


@@ -2119,22 +2153,22 @@ options are valid."
        ;; Show HARD SPACEs
        (list whitespace-hspace-regexp 1 whitespace-hspace t))
        t))
        ;; Show HARD SPACEs
        (list whitespace-hspace-regexp 1 whitespace-hspace t))
        t))

-    (when (memq 'tabs whitespace-active-color)
+    (when (memq 'tabs whitespace-active-style)

       (font-lock-add-keywords
        nil
        (list
        ;; Show TABs
        (list whitespace-tab-regexp 1 whitespace-tab t))
        t))
       (font-lock-add-keywords
        nil
        (list
        ;; Show TABs
        (list whitespace-tab-regexp 1 whitespace-tab t))
        t))

-    (when (memq 'trailing whitespace-active-color)
+    (when (memq 'trailing whitespace-active-style)

       (font-lock-add-keywords
        nil
        (list
        ;; Show trailing blanks
       (font-lock-add-keywords
        nil
        (list
        ;; Show trailing blanks

-       (list (whitespace-trailing-regexp) 1 whitespace-trailing t))
+       (list whitespace-trailing-regexp 1 whitespace-trailing t))

        t))
        t))

-    (when (or (memq 'lines      whitespace-active-color)
-             (memq 'lines-tail whitespace-active-color))
+    (when (or (memq 'lines      whitespace-active-style)
+             (memq 'lines-tail whitespace-active-style))

       (font-lock-add-keywords
        nil
        (list
       (font-lock-add-keywords
        nil
        (list


@@ -2148,13 +2182,13 @@ options are valid."
            (if (zerop rem)
                ""
              (format ".\\{%d\\}" rem))))
            (if (zerop rem)
                ""
              (format ".\\{%d\\}" rem))))

-        (if (memq 'lines whitespace-active-color)
+        (if (memq 'lines whitespace-active-style)

             0                          ; whole line
           2)                           ; line tail
         whitespace-line t))
        t))
     (cond
             0                          ; whole line
           2)                           ; line tail
         whitespace-line t))
        t))
     (cond

-     ((memq 'space-before-tab whitespace-active-color)
+     ((memq 'space-before-tab whitespace-active-style)

       (font-lock-add-keywords
        nil
        (list
       (font-lock-add-keywords
        nil
        (list


@@ -2163,7 +2197,7 @@ options are valid."
              (if whitespace-indent-tabs-mode 1 2)
              whitespace-space-before-tab t))
        t))
              (if whitespace-indent-tabs-mode 1 2)
              whitespace-space-before-tab t))
        t))

-     ((memq 'space-before-tab::tab whitespace-active-color)
+     ((memq 'space-before-tab::tab whitespace-active-style)

       (font-lock-add-keywords
        nil
        (list
       (font-lock-add-keywords
        nil
        (list


@@ -2171,7 +2205,7 @@ options are valid."
        (list whitespace-space-before-tab-regexp
              1 whitespace-space-before-tab t))
        t))
        (list whitespace-space-before-tab-regexp
              1 whitespace-space-before-tab t))
        t))

-     ((memq 'space-before-tab::space whitespace-active-color)
+     ((memq 'space-before-tab::space whitespace-active-style)

       (font-lock-add-keywords
        nil
        (list
       (font-lock-add-keywords
        nil
        (list


@@ -2180,7 +2214,7 @@ options are valid."
              2 whitespace-space-before-tab t))
        t)))
     (cond
              2 whitespace-space-before-tab t))
        t)))
     (cond

-     ((memq 'indentation whitespace-active-color)
+     ((memq 'indentation whitespace-active-style)

       (font-lock-add-keywords
        nil
        (list
       (font-lock-add-keywords
        nil
        (list


@@ -2188,7 +2222,7 @@ options are valid."
        (list (whitespace-indentation-regexp)
              1 whitespace-indentation t))
        t))
        (list (whitespace-indentation-regexp)
              1 whitespace-indentation t))
        t))

-     ((memq 'indentation::tab whitespace-active-color)
+     ((memq 'indentation::tab whitespace-active-style)

       (font-lock-add-keywords
        nil
        (list
       (font-lock-add-keywords
        nil
        (list


@@ -2196,7 +2230,7 @@ options are valid."
        (list (whitespace-indentation-regexp 'tab)
              1 whitespace-indentation t))
        t))
        (list (whitespace-indentation-regexp 'tab)
              1 whitespace-indentation t))
        t))

-     ((memq 'indentation::space whitespace-active-color)
+     ((memq 'indentation::space whitespace-active-style)

       (font-lock-add-keywords
        nil
        (list
       (font-lock-add-keywords
        nil
        (list


@@ -2204,7 +2238,7 @@ options are valid."
        (list (whitespace-indentation-regexp 'space)
              1 whitespace-indentation t))
        t)))
        (list (whitespace-indentation-regexp 'space)
              1 whitespace-indentation t))
        t)))

-    (when (memq 'empty whitespace-active-color)
+    (when (memq 'empty whitespace-active-style)

       (font-lock-add-keywords
        nil
        (list
       (font-lock-add-keywords
        nil
        (list


@@ -2220,7 +2254,7 @@ options are valid."
              1 whitespace-empty t))
        t))
     (cond
              1 whitespace-empty t))
        t))
     (cond

-     ((memq 'space-after-tab whitespace-active-color)
+     ((memq 'space-after-tab whitespace-active-style)

       (font-lock-add-keywords
        nil
        (list
       (font-lock-add-keywords
        nil
        (list


@@ -2228,7 +2262,7 @@ options are valid."
        (list (whitespace-space-after-tab-regexp)
              1 whitespace-space-after-tab t))
        t))
        (list (whitespace-space-after-tab-regexp)
              1 whitespace-space-after-tab t))
        t))

-     ((memq 'space-after-tab::tab whitespace-active-color)
+     ((memq 'space-after-tab::tab whitespace-active-style)

       (font-lock-add-keywords
        nil
        (list
       (font-lock-add-keywords
        nil
        (list


@@ -2236,7 +2270,7 @@ options are valid."
        (list (whitespace-space-after-tab-regexp 'tab)
              1 whitespace-space-after-tab t))
        t))
        (list (whitespace-space-after-tab-regexp 'tab)
              1 whitespace-space-after-tab t))
        t))

-     ((memq 'space-after-tab::space whitespace-active-color)
+     ((memq 'space-after-tab::space whitespace-active-style)

       (font-lock-add-keywords
        nil
        (list
       (font-lock-add-keywords
        nil
        (list


@@ -2250,8 +2284,8 @@ options are valid."
 
 (defun whitespace-color-off ()
   "Turn off color visualization."
 
 (defun whitespace-color-off ()
   "Turn off color visualization."

-  (when whitespace-active-color
-    ;; turn off font lock
+  ;; turn off font lock
+  (when (whitespace-style-face-p)

     (font-lock-mode 0)
     (when whitespace-font-lock
       (setq whitespace-font-lock nil
     (font-lock-mode 0)
     (when whitespace-font-lock
       (setq whitespace-font-lock nil


@@ -2264,11 +2298,11 @@ options are valid."
 ;;;; Hacked from visws.el (Miles Bader <miles@gnu.org>)
 
 
 ;;;; Hacked from visws.el (Miles Bader <miles@gnu.org>)
 
 

-(defvar whitespace-display-table nil
-  "Used to save a local display table.")
-
-(defvar whitespace-display-table-was-local nil
-  "Used to remember whether a buffer initially had a local display table.")
+(defun whitespace-style-mark-p ()
+  "Return t if there is some visualization via display table."
+  (or (memq 'tab-mark     whitespace-active-style)
+      (memq 'space-mark   whitespace-active-style)
+      (memq 'newline-mark whitespace-active-style)))

 
 
 (defsubst whitespace-char-valid-p (char)
 
 
 (defsubst whitespace-char-valid-p (char)


@@ -2288,7 +2322,8 @@ options are valid."
 
 (defun whitespace-display-char-on ()
   "Turn on character display mapping."
 
 (defun whitespace-display-char-on ()
   "Turn on character display mapping."

-  (when whitespace-display-mappings
+  (when (and whitespace-display-mappings
+            (whitespace-style-mark-p))

     (let (vecs vec)
       ;; Remember whether a buffer has a local display table.
       (unless whitespace-display-table-was-local
     (let (vecs vec)
       ;; Remember whether a buffer has a local display table.
       (unless whitespace-display-table-was-local


@@ -2299,7 +2334,7 @@ options are valid."
        (setq buffer-display-table (make-display-table)))
       (dolist (entry whitespace-display-mappings)
        ;; check if it is to display this mark
        (setq buffer-display-table (make-display-table)))
       (dolist (entry whitespace-display-mappings)
        ;; check if it is to display this mark

-       (when (memq (car entry) whitespace-style-mark)
+       (when (memq (car entry) whitespace-style)

          ;; Get a displayable mapping.
          (setq vecs (cddr entry))
          (while (and vecs
          ;; Get a displayable mapping.
          (setq vecs (cddr entry))
          (while (and vecs


@@ -2310,7 +2345,7 @@ options are valid."
            (setq vec (copy-sequence (car vecs)))
            ;; NEWLINE char
            (when (and (eq (cadr entry) ?\n)
            (setq vec (copy-sequence (car vecs)))
            ;; NEWLINE char
            (when (and (eq (cadr entry) ?\n)

-                      (memq 'newline whitespace-active-color))
+                      (memq 'newline whitespace-active-style))

              ;; Only insert face bits on NEWLINE char mapping to avoid
              ;; obstruction of other faces like TABs and (HARD) SPACEs
              ;; faces, font-lock faces, etc.
              ;; Only insert face bits on NEWLINE char mapping to avoid
              ;; obstruction of other faces like TABs and (HARD) SPACEs
              ;; faces, font-lock faces, etc.


@@ -2326,6 +2361,7 @@ options are valid."
 (defun whitespace-display-char-off ()
   "Turn off character display mapping."
   (and whitespace-display-mappings
 (defun whitespace-display-char-off ()
   "Turn off character display mapping."
   (and whitespace-display-mappings

+       (whitespace-style-mark-p)

        whitespace-display-table-was-local
        (setq whitespace-display-table-was-local nil
             buffer-display-table whitespace-display-table)))
        whitespace-display-table-was-local
        (setq whitespace-display-table-was-local nil
             buffer-display-table whitespace-display-table)))


@@ -2343,44 +2379,22 @@ options are valid."
         (whitespace-report nil t))))
 
 
         (whitespace-report nil t))))
 
 

-(defun whitespace-add-local-hook ()
-  "Add some whitespace hooks locally."
-  (add-hook 'write-file-functions 'whitespace-write-file-hook nil t)
-  (add-hook 'kill-buffer-hook 'whitespace-kill-buffer-hook nil t))
-
-
-(defun whitespace-remove-local-hook ()
-  "Remove some whitespace hooks locally."
-  (remove-hook 'write-file-functions 'whitespace-write-file-hook t)
-  (remove-hook 'kill-buffer-hook 'whitespace-kill-buffer-hook t))
-
-

 (defun whitespace-write-file-hook ()
   "Action to be taken when buffer is written.
 It should be added buffer-locally to `write-file-functions'."
 (defun whitespace-write-file-hook ()
   "Action to be taken when buffer is written.
 It should be added buffer-locally to `write-file-functions'."

-  (when (whitespace-action)
-    (error "Abort write due to whitespace problems in %s"
-          (buffer-name)))
-  nil)                                 ; continue hook processing
-
-
-(defun whitespace-kill-buffer-hook ()
-  "Action to be taken when buffer is killed.
-It should be added buffer-locally to `kill-buffer-hook'."
-  (whitespace-action)
+  (cond ((memq 'auto-cleanup whitespace-action)
+        (whitespace-cleanup))
+       ((memq 'abort-on-bogus whitespace-action)
+        (when (whitespace-report nil t)
+          (error "Abort write due to whitespace problems in %s"
+                 (buffer-name)))))

   nil)                                 ; continue hook processing
 
 
   nil)                                 ; continue hook processing
 
 

-(defun whitespace-action ()
-  "Action to be taken when buffer is killed or written.
-Return t when the action should be aborted."
-  (cond ((memq 'auto-cleanup whitespace-action)
-        (whitespace-cleanup)
-        nil)
-       ((memq 'abort-on-bogus whitespace-action)
-        (whitespace-report nil t))
-       (t
-        nil)))
+(defun whitespace-warn-read-only (msg)
+  "Warn if buffer is read-only."
+  (when (memq 'warn-if-read-only whitespace-action)
+    (message "Can't %s: %s is read-only" msg (buffer-name))))

 
 \f
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 \f
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;