summaryrefslogtreecommitdiff
path: root/lisp/whitespace.el
diff options
context:
space:
mode:
authorMiles Bader <miles@gnu.org>2008-01-22 23:53:46 +0000
committerMiles Bader <miles@gnu.org>2008-01-22 23:53:46 +0000
commit1bad168e59601c1c843a38b2962e77b29f497f11 (patch)
tree26f29332811458573579bb0b807ff85a8d32b807 /lisp/whitespace.el
parent22f9eb9e4f09de5570ba5ede033b0a8f0973a0e9 (diff)
parent645b6388d5bae5304098c1e773694beffc3478e9 (diff)
downloademacs-1bad168e59601c1c843a38b2962e77b29f497f11.tar.gz
Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1006
Diffstat (limited to 'lisp/whitespace.el')
-rw-r--r--lisp/whitespace.el10
1 files changed, 5 insertions, 5 deletions
diff --git a/lisp/whitespace.el b/lisp/whitespace.el
index 3afa2246d45..b2ef06c9584 100644
--- a/lisp/whitespace.el
+++ b/lisp/whitespace.el
@@ -159,21 +159,21 @@ visited by the buffers.")
(defcustom whitespace-check-leading-whitespace t
"Flag to check leading whitespace. This is the global for the system.
-It can be overriden by setting a buffer local variable
+It can be overridden by setting a buffer local variable
`whitespace-check-buffer-leading'."
:type 'boolean
:group 'whitespace)
(defcustom whitespace-check-trailing-whitespace t
"Flag to check trailing whitespace. This is the global for the system.
-It can be overriden by setting a buffer local variable
+It can be overridden by setting a buffer local variable
`whitespace-check-buffer-trailing'."
:type 'boolean
:group 'whitespace)
(defcustom whitespace-check-spacetab-whitespace t
"Flag to check space followed by a TAB. This is the global for the system.
-It can be overriden by setting a buffer local variable
+It can be overridden by setting a buffer local variable
`whitespace-check-buffer-spacetab'."
:type 'boolean
:group 'whitespace)
@@ -185,7 +185,7 @@ It can be overriden by setting a buffer local variable
(defcustom whitespace-check-indent-whitespace indent-tabs-mode
"Flag to check indentation whitespace. This is the global for the system.
-It can be overriden by setting a buffer local variable
+It can be overridden by setting a buffer local variable
`whitespace-check-buffer-indent'."
:type 'boolean
:group 'whitespace)
@@ -198,7 +198,7 @@ The default value ignores leading TABs."
(defcustom whitespace-check-ateol-whitespace t
"Flag to check end-of-line whitespace. This is the global for the system.
-It can be overriden by setting a buffer local variable
+It can be overridden by setting a buffer local variable
`whitespace-check-buffer-ateol'."
:type 'boolean
:group 'whitespace)