diff options
| author | Chong Yidong | 2009-10-24 21:51:03 +0000 |
|---|---|---|
| committer | Chong Yidong | 2009-10-24 21:51:03 +0000 |
| commit | cdd47d486241da5b07edb107020b5cf937fd63b1 (patch) | |
| tree | 1dd8976b0ce2ecf772c7e5c21bb69bcaff3f19ae | |
| parent | ba07c9ad6ca99c680fec4711333db0009b997214 (diff) | |
| download | emacs-cdd47d486241da5b07edb107020b5cf937fd63b1.tar.gz emacs-cdd47d486241da5b07edb107020b5cf937fd63b1.zip | |
* whitespace.el (whitespace-mode, whitespace-newline-mode)
(global-whitespace-mode, global-whitespace-newline-mode)
(whitespace-toggle-options, global-whitespace-toggle-options): Doc
fix (Bug#3660).
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/whitespace.el | 8 |
2 files changed, 5 insertions, 8 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 05fc82ece96..a51fc89ea14 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,10 @@ | |||
| 1 | 2009-10-24 Chong Yidong <cyd@stupidchicken.com> | 1 | 2009-10-24 Chong Yidong <cyd@stupidchicken.com> |
| 2 | 2 | ||
| 3 | * whitespace.el (whitespace-mode, whitespace-newline-mode) | ||
| 4 | (global-whitespace-mode, global-whitespace-newline-mode) | ||
| 5 | (whitespace-toggle-options, global-whitespace-toggle-options): Doc | ||
| 6 | fix (Bug#3660). | ||
| 7 | |||
| 3 | * nxml/nxml-mode.el (nxml-balanced-close-start-tag): Use the value | 8 | * nxml/nxml-mode.el (nxml-balanced-close-start-tag): Use the value |
| 4 | of xmltok-start before the end tag was inserted (Bug#2840). | 9 | of xmltok-start before the end tag was inserted (Bug#2840). |
| 5 | 10 | ||
diff --git a/lisp/whitespace.el b/lisp/whitespace.el index a66bd9360f3..4529180c7ee 100644 --- a/lisp/whitespace.el +++ b/lisp/whitespace.el | |||
| @@ -1022,7 +1022,6 @@ Any other value is treated as nil." | |||
| 1022 | If ARG is null, toggle whitespace visualization. | 1022 | If ARG is null, toggle whitespace visualization. |
| 1023 | If ARG is a number greater than zero, turn on visualization; | 1023 | If ARG is a number greater than zero, turn on visualization; |
| 1024 | otherwise, turn off visualization. | 1024 | otherwise, turn off visualization. |
| 1025 | Only useful with a windowing system. | ||
| 1026 | 1025 | ||
| 1027 | See also `whitespace-style', `whitespace-newline' and | 1026 | See also `whitespace-style', `whitespace-newline' and |
| 1028 | `whitespace-display-mappings'." | 1027 | `whitespace-display-mappings'." |
| @@ -1047,7 +1046,6 @@ See also `whitespace-style', `whitespace-newline' and | |||
| 1047 | If ARG is null, toggle NEWLINE visualization. | 1046 | If ARG is null, toggle NEWLINE visualization. |
| 1048 | If ARG is a number greater than zero, turn on visualization; | 1047 | If ARG is a number greater than zero, turn on visualization; |
| 1049 | otherwise, turn off visualization. | 1048 | otherwise, turn off visualization. |
| 1050 | Only useful with a windowing system. | ||
| 1051 | 1049 | ||
| 1052 | Use `whitespace-newline-mode' only for NEWLINE visualization | 1050 | Use `whitespace-newline-mode' only for NEWLINE visualization |
| 1053 | exclusively. For other visualizations, including NEWLINE | 1051 | exclusively. For other visualizations, including NEWLINE |
| @@ -1076,7 +1074,6 @@ See also `whitespace-newline' and `whitespace-display-mappings'." | |||
| 1076 | If ARG is null, toggle whitespace visualization. | 1074 | If ARG is null, toggle whitespace visualization. |
| 1077 | If ARG is a number greater than zero, turn on visualization; | 1075 | If ARG is a number greater than zero, turn on visualization; |
| 1078 | otherwise, turn off visualization. | 1076 | otherwise, turn off visualization. |
| 1079 | Only useful with a windowing system. | ||
| 1080 | 1077 | ||
| 1081 | See also `whitespace-style', `whitespace-newline' and | 1078 | See also `whitespace-style', `whitespace-newline' and |
| 1082 | `whitespace-display-mappings'." | 1079 | `whitespace-display-mappings'." |
| @@ -1133,7 +1130,6 @@ See also `whitespace-style', `whitespace-newline' and | |||
| 1133 | If ARG is null, toggle NEWLINE visualization. | 1130 | If ARG is null, toggle NEWLINE visualization. |
| 1134 | If ARG is a number greater than zero, turn on visualization; | 1131 | If ARG is a number greater than zero, turn on visualization; |
| 1135 | otherwise, turn off visualization. | 1132 | otherwise, turn off visualization. |
| 1136 | Only useful with a windowing system. | ||
| 1137 | 1133 | ||
| 1138 | Use `global-whitespace-newline-mode' only for NEWLINE | 1134 | Use `global-whitespace-newline-mode' only for NEWLINE |
| 1139 | visualization exclusively. For other visualizations, including | 1135 | visualization exclusively. For other visualizations, including |
| @@ -1299,8 +1295,6 @@ The valid symbols are: | |||
| 1299 | 1295 | ||
| 1300 | whitespace-style restore `whitespace-style' value | 1296 | whitespace-style restore `whitespace-style' value |
| 1301 | 1297 | ||
| 1302 | Only useful with a windowing system. | ||
| 1303 | |||
| 1304 | See `whitespace-style' and `indent-tabs-mode' for documentation." | 1298 | See `whitespace-style' and `indent-tabs-mode' for documentation." |
| 1305 | (interactive (whitespace-interactive-char t)) | 1299 | (interactive (whitespace-interactive-char t)) |
| 1306 | (let ((whitespace-style | 1300 | (let ((whitespace-style |
| @@ -1378,8 +1372,6 @@ The valid symbols are: | |||
| 1378 | 1372 | ||
| 1379 | whitespace-style restore `whitespace-style' value | 1373 | whitespace-style restore `whitespace-style' value |
| 1380 | 1374 | ||
| 1381 | Only useful with a windowing system. | ||
| 1382 | |||
| 1383 | See `whitespace-style' and `indent-tabs-mode' for documentation." | 1375 | See `whitespace-style' and `indent-tabs-mode' for documentation." |
| 1384 | (interactive (whitespace-interactive-char nil)) | 1376 | (interactive (whitespace-interactive-char nil)) |
| 1385 | (let ((whitespace-style | 1377 | (let ((whitespace-style |