mirror of
https://github.com/masscollaborationlabs/emacs.git
synced 2025-07-11 14:40:50 +00:00
; Fix last change in whitespace.el.
This commit is contained in:
Eli Zaretskii
parent
52ad2b53cb
commit
cbd2c87a5d
1 changed files with 97 additions and 97 deletions
|
|
@ -276,116 +276,116 @@
|
||||||
|
|
||||||
It's a list containing some or all of the following values:
|
It's a list containing some or all of the following values:
|
||||||
|
|
||||||
face enable all visualization via faces (see below).
|
face enable all visualization via faces (see below).
|
||||||
|
|
||||||
trailing trailing blanks are visualized via faces.
|
trailing trailing blanks are visualized via faces.
|
||||||
It has effect only if `face' (see above)
|
It has effect only if `face' (see above)
|
||||||
is present in `whitespace-style'.
|
is present in `whitespace-style'.
|
||||||
|
|
||||||
tabs TABs are visualized via faces.
|
tabs TABs are visualized via faces.
|
||||||
It has effect only if `face' (see above)
|
It has effect only if `face' (see above)
|
||||||
is present in `whitespace-style'.
|
is present in `whitespace-style'.
|
||||||
|
|
||||||
spaces SPACEs and HARD SPACEs are visualized via
|
spaces SPACEs and HARD SPACEs are visualized via
|
||||||
faces.
|
faces.
|
||||||
It has effect only if `face' (see above)
|
It has effect only if `face' (see above)
|
||||||
is present in `whitespace-style'.
|
is present in `whitespace-style'.
|
||||||
|
|
||||||
lines lines which have columns beyond
|
lines lines which have columns beyond
|
||||||
`whitespace-line-column' are highlighted via
|
`whitespace-line-column' are highlighted via
|
||||||
faces.
|
faces.
|
||||||
Whole line is highlighted.
|
Whole line is highlighted.
|
||||||
It has precedence over `lines-tail' (see
|
It has precedence over `lines-tail' (see
|
||||||
below).
|
below).
|
||||||
It has effect only if `face' (see above)
|
It has effect only if `face' (see above)
|
||||||
is present in `whitespace-style'.
|
is present in `whitespace-style'.
|
||||||
|
|
||||||
lines-tail lines which have columns beyond
|
lines-tail lines which have columns beyond
|
||||||
`whitespace-line-column' are highlighted via
|
`whitespace-line-column' are highlighted via
|
||||||
faces.
|
faces.
|
||||||
But only the part of line which goes
|
But only the part of line which goes
|
||||||
beyond `whitespace-line-column' column.
|
beyond `whitespace-line-column' column.
|
||||||
It has effect only if `lines' (see above)
|
It has effect only if `lines' (see above)
|
||||||
is not present in `whitespace-style'
|
is not present in `whitespace-style'
|
||||||
and if `face' (see above) is present in
|
and if `face' (see above) is present in
|
||||||
`whitespace-style'.
|
`whitespace-style'.
|
||||||
|
|
||||||
newline NEWLINEs are visualized via faces.
|
newline NEWLINEs are visualized via faces.
|
||||||
It has effect only if `face' (see above)
|
It has effect only if `face' (see above)
|
||||||
is present in `whitespace-style'.
|
is present in `whitespace-style'.
|
||||||
|
|
||||||
missing-newline-at-eof Missing newline at the end of the file is
|
missing-newline-at-eof Missing newline at the end of the file is
|
||||||
visualized via faces.
|
visualized via faces.
|
||||||
It has effect only if `face' (see above)
|
It has effect only if `face' (see above)
|
||||||
is present in `whitespace-style'.
|
is present in `whitespace-style'.
|
||||||
|
|
||||||
empty empty lines at beginning and/or end of buffer
|
empty empty lines at beginning and/or end of buffer
|
||||||
are visualized via faces.
|
are visualized via faces.
|
||||||
It has effect only if `face' (see above)
|
It has effect only if `face' (see above)
|
||||||
is present in `whitespace-style'.
|
is present in `whitespace-style'.
|
||||||
|
|
||||||
indentation::tab `tab-width' or more SPACEs at beginning of line
|
indentation::tab `tab-width' or more SPACEs at beginning of line
|
||||||
are visualized via faces.
|
are visualized via faces.
|
||||||
It has effect only if `face' (see above)
|
It has effect only if `face' (see above)
|
||||||
is present in `whitespace-style'.
|
is present in `whitespace-style'.
|
||||||
|
|
||||||
indentation::space TABs at beginning of line are visualized via
|
indentation::space TABs at beginning of line are visualized via
|
||||||
faces.
|
faces.
|
||||||
It has effect only if `face' (see above)
|
It has effect only if `face' (see above)
|
||||||
is present in `whitespace-style'.
|
is present in `whitespace-style'.
|
||||||
|
|
||||||
indentation `tab-width' or more SPACEs at beginning of line
|
indentation `tab-width' or more SPACEs at beginning of line
|
||||||
are visualized, if `indent-tabs-mode' (which
|
are visualized, if `indent-tabs-mode' (which
|
||||||
see) is non-nil; otherwise, TABs at beginning
|
see) is non-nil; otherwise, TABs at beginning
|
||||||
of line are visualized via faces.
|
of line are visualized via faces.
|
||||||
It has effect only if `face' (see above)
|
It has effect only if `face' (see above)
|
||||||
is present in `whitespace-style'.
|
is present in `whitespace-style'.
|
||||||
|
|
||||||
big-indent Big indentations are visualized via faces.
|
big-indent Big indentations are visualized via faces.
|
||||||
It has effect only if `face' (see above)
|
It has effect only if `face' (see above)
|
||||||
is present in `whitespace-style'.
|
is present in `whitespace-style'.
|
||||||
|
|
||||||
space-after-tab::tab `tab-width' or more SPACEs after a TAB
|
space-after-tab::tab `tab-width' or more SPACEs after a TAB
|
||||||
are visualized via faces.
|
are visualized via faces.
|
||||||
It has effect only if `face' (see above)
|
It has effect only if `face' (see above)
|
||||||
is present in `whitespace-style'.
|
is present in `whitespace-style'.
|
||||||
|
|
||||||
space-after-tab::space TABs are visualized when `tab-width' or
|
space-after-tab::space TABs are visualized when `tab-width' or
|
||||||
more SPACEs occur after a TAB, via
|
more SPACEs occur after a TAB, via
|
||||||
faces.
|
faces.
|
||||||
It has effect only if `face' (see above)
|
It has effect only if `face' (see above)
|
||||||
is present in `whitespace-style'.
|
is present in `whitespace-style'.
|
||||||
|
|
||||||
space-after-tab `tab-width' or more SPACEs after a TAB
|
space-after-tab `tab-width' or more SPACEs after a TAB
|
||||||
are visualized, if `indent-tabs-mode'
|
are visualized, if `indent-tabs-mode'
|
||||||
(which see) is non-nil; otherwise,
|
(which see) is non-nil; otherwise,
|
||||||
the TABs are visualized via faces.
|
the TABs are visualized via faces.
|
||||||
It has effect only if `face' (see above)
|
It has effect only if `face' (see above)
|
||||||
is present in `whitespace-style'.
|
is present in `whitespace-style'.
|
||||||
|
|
||||||
space-before-tab::tab SPACEs before TAB are visualized via
|
space-before-tab::tab SPACEs before TAB are visualized via
|
||||||
faces.
|
faces.
|
||||||
It has effect only if `face' (see above)
|
It has effect only if `face' (see above)
|
||||||
is present in `whitespace-style'.
|
is present in `whitespace-style'.
|
||||||
|
|
||||||
space-before-tab::space TABs are visualized when SPACEs occur
|
space-before-tab::space TABs are visualized when SPACEs occur
|
||||||
before TAB, via faces.
|
before TAB, via faces.
|
||||||
It has effect only if `face' (see above)
|
It has effect only if `face' (see above)
|
||||||
is present in `whitespace-style'.
|
is present in `whitespace-style'.
|
||||||
|
|
||||||
space-before-tab SPACEs before TAB are visualized, if
|
space-before-tab SPACEs before TAB are visualized, if
|
||||||
`indent-tabs-mode' (which see) is
|
`indent-tabs-mode' (which see) is
|
||||||
non-nil; otherwise, the TABs are
|
non-nil; otherwise, the TABs are
|
||||||
visualized via faces.
|
visualized via faces.
|
||||||
It has effect only if `face' (see above)
|
It has effect only if `face' (see above)
|
||||||
is present in `whitespace-style'.
|
is present in `whitespace-style'.
|
||||||
|
|
||||||
space-mark SPACEs and HARD SPACEs are visualized via
|
space-mark SPACEs and HARD SPACEs are visualized via
|
||||||
display table.
|
display table.
|
||||||
|
|
||||||
tab-mark TABs are visualized via display table.
|
tab-mark TABs are visualized via display table.
|
||||||
|
|
||||||
newline-mark NEWLINEs are visualized via display table.
|
newline-mark NEWLINEs are visualized via display table.
|
||||||
|
|
||||||
Any other value is ignored.
|
Any other value is ignored.
|
||||||
|
|
||||||
|
|
@ -808,21 +808,21 @@ Each element has the following form:
|
||||||
|
|
||||||
Where:
|
Where:
|
||||||
|
|
||||||
KIND is the kind of character.
|
KIND is the kind of character.
|
||||||
It can be one of the following symbols:
|
It can be one of the following symbols:
|
||||||
|
|
||||||
tab-mark for TAB character
|
tab-mark for TAB character
|
||||||
|
|
||||||
space-mark for SPACE or HARD SPACE character
|
space-mark for SPACE or HARD SPACE character
|
||||||
|
|
||||||
newline-mark for NEWLINE character
|
newline-mark for NEWLINE character
|
||||||
|
|
||||||
CHAR is the character to be mapped.
|
CHAR is the character to be mapped.
|
||||||
|
|
||||||
VECTOR is a vector of characters to be displayed in place of CHAR.
|
VECTOR is a vector of characters to be displayed in place of CHAR.
|
||||||
The first display vector that can be displayed is used;
|
The first display vector that can be displayed is used;
|
||||||
if no display vector for a mapping can be displayed, then
|
if no display vector for a mapping can be displayed, then
|
||||||
that character is displayed unmodified.
|
that character is displayed unmodified.
|
||||||
|
|
||||||
The NEWLINE character is displayed using the face given by
|
The NEWLINE character is displayed using the face given by
|
||||||
`whitespace-newline' variable.
|
`whitespace-newline' variable.
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue