diff options
| author | Philipp Stephani | 2015-05-02 12:15:46 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2015-05-02 12:15:46 +0300 |
| commit | 3874b33a32ccc481a12a7b9259b7c3963a786a6f (patch) | |
| tree | f49e6500591e26dd4df5dbd3d7e3412ad3a0e060 | |
| parent | ad7e1143fc6d904bc5a9a0a05536986f53a48cf7 (diff) | |
| download | emacs-3874b33a32ccc481a12a7b9259b7c3963a786a6f.tar.gz emacs-3874b33a32ccc481a12a7b9259b7c3963a786a6f.zip | |
Update the options in whitespace-style defcustom
* lisp/whitespace.el (whitespace-style): Use `set' instead of a
`repeat' because the option is really set-like. Add missing
options. Reorder options to match the order in the
documentation. (Bug#20346)
| -rw-r--r-- | lisp/whitespace.el | 53 |
1 files changed, 28 insertions, 25 deletions
diff --git a/lisp/whitespace.el b/lisp/whitespace.el index b4cd67ff6b9..fad3e2f3ea6 100644 --- a/lisp/whitespace.el +++ b/lisp/whitespace.el | |||
| @@ -538,31 +538,34 @@ cleaning up a buffer. See `whitespace-cleanup' and | |||
| 538 | `whitespace-cleanup-region' for documentation. | 538 | `whitespace-cleanup-region' for documentation. |
| 539 | 539 | ||
| 540 | See also `whitespace-display-mappings' for documentation." | 540 | See also `whitespace-display-mappings' for documentation." |
| 541 | :type '(repeat :tag "Kind of Blank" | 541 | :type '(set :tag "Kind of Blank" |
| 542 | (choice :tag "Kind of Blank Face" | 542 | (const :tag "(Face) Face visualization" face) |
| 543 | (const :tag "(Face) Face visualization" | 543 | (const :tag "(Face) Trailing TABs, SPACEs and HARD SPACEs" |
| 544 | face) | 544 | trailing) |
| 545 | (const :tag "(Face) Trailing TABs, SPACEs and HARD SPACEs" | 545 | (const :tag "(Face) TABs" tabs) |
| 546 | trailing) | 546 | (const :tag "(Face) SPACEs and HARD SPACEs" spaces) |
| 547 | (const :tag "(Face) SPACEs and HARD SPACEs" | 547 | (const :tag "(Face) Lines" lines) |
| 548 | spaces) | 548 | (const :tag "(Face) Lines, only overlong part" lines-tail) |
| 549 | (const :tag "(Face) TABs" tabs) | 549 | (const :tag "(Face) NEWLINEs" newline) |
| 550 | (const :tag "(Face) Lines" lines) | 550 | (const :tag "(Face) Empty Lines At BOB And/Or EOB" empty) |
| 551 | (const :tag "(Face) SPACEs before TAB" | 551 | (const :tag "(Face) Indentation SPACEs" indentation::tab) |
| 552 | space-before-tab) | 552 | (const :tag "(Face) Indentation TABs" |
| 553 | (const :tag "(Face) NEWLINEs" newline) | 553 | indentation::space) |
| 554 | (const :tag "(Face) Indentation SPACEs" | 554 | (const :tag "(Face) Indentation TABs or SPACEs" indentation) |
| 555 | indentation) | 555 | (const :tag "(Face) Too much line indentation" big-indent) |
| 556 | (const :tag "(Face) Too much line indentation" | 556 | (const :tag "(Face) SPACEs after TAB: SPACEs" |
| 557 | big-indent) | 557 | space-after-tab::tab) |
| 558 | (const :tag "(Face) Empty Lines At BOB And/Or EOB" | 558 | (const :tag "(Face) SPACEs after TAB: TABs" |
| 559 | empty) | 559 | space-after-tab::space) |
| 560 | (const :tag "(Face) SPACEs after TAB" | 560 | (const :tag "(Face) SPACEs after TAB" space-after-tab) |
| 561 | space-after-tab) | 561 | (const :tag "(Face) SPACEs before TAB: SPACEs" |
| 562 | (const :tag "(Mark) SPACEs and HARD SPACEs" | 562 | space-before-tab::tab) |
| 563 | space-mark) | 563 | (const :tag "(Face) SPACEs before TAB: TABs" |
| 564 | (const :tag "(Mark) TABs" tab-mark) | 564 | space-before-tab::space) |
| 565 | (const :tag "(Mark) NEWLINEs" newline-mark))) | 565 | (const :tag "(Face) SPACEs before TAB" space-before-tab) |
| 566 | (const :tag "(Mark) SPACEs and HARD SPACEs" space-mark) | ||
| 567 | (const :tag "(Mark) TABs" tab-mark) | ||
| 568 | (const :tag "(Mark) NEWLINEs" newline-mark)) | ||
| 566 | :group 'whitespace) | 569 | :group 'whitespace) |
| 567 | 570 | ||
| 568 | (defvar whitespace-space 'whitespace-space | 571 | (defvar whitespace-space 'whitespace-space |