;;; whitespace.el --- warn about and clean bogus whitespaces in the file
-;; Copyright (C) 1999-2011 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2015 Free Software Foundation, Inc.
;; Author: Rajesh Vaidheeswarran <rv@gnu.org>
;; Keywords: convenience
;; 4. Spaces followed by a TAB. (Almost always, we never want that).
;; 5. Spaces or TABS at the end of a line.
;;
-;; Whitespace errors are reported in a buffer, and on the modeline.
+;; Whitespace errors are reported in a buffer, and on the mode line.
;;
-;; Modeline will show a W:<x>!<y> to denote a particular type of whitespace,
+;; Mode line will show a W:<x>!<y> to denote a particular type of whitespace,
;; where `x' and `y' can be one (or more) of:
;;
;; e - End-of-Line whitespace.
;; s - Space followed by Tab.
;; t - Trailing whitespace.
;;
-;; If any of the whitespace checks is turned off, the modeline will display a
+;; If any of the whitespace checks is turned off, the mode line will display a
;; !<y>.
;;
;; (since (3) is the most controversial one, here is the rationale: Most
:group 'whitespace)
(defcustom whitespace-silent nil
- "All whitespace errors will be shown only in the modeline when t.
+ "All whitespace errors will be shown only in the mode line when t.
Note that setting this may cause all whitespaces introduced in a file to go
unnoticed when the buffer is killed, unless the user visits the `*Whitespace
:type 'boolean
:group 'whitespace)
-(defgroup whitespace-faces nil
- "Faces used in whitespace."
- :prefix "whitespace-"
- :group 'whitespace
- :group 'faces)
-
(defface whitespace-highlight '((((class color) (background light))
(:background "green1"))
(((class color) (background dark))
(background dark))
(:background "white")))
"Face used for highlighting the bogus whitespaces that exist in the buffer."
- :group 'whitespace-faces)
+ :group 'whitespace)
(define-obsolete-face-alias 'whitespace-highlight-face
'whitespace-highlight "22.1")
(whitespace-check-whitespace-mode current-prefix-arg)
(if (and buffer-file-name whitespace-mode)
(let ((whitespace-any nil)
- (whitespace-tabwith 8)
- (whitespace-tabwith-saved tab-width))
+ (whitespace-tabwidth 8)
+ (whitespace-tabwidth-saved tab-width))
;; since all printable TABS should be 8, irrespective of how
;; they are displayed.
- (setq tab-width whitespace-tabwith)
+ (setq tab-width whitespace-tabwidth)
(if (and whitespace-check-buffer-leading
(whitespace-buffer-leading))
(message "The region is now clean")
(message "%s is now clean" buffer-file-name)))
(whitespace-update-modeline)))
- (setq tab-width whitespace-tabwith-saved))))
+ (setq tab-width whitespace-tabwidth-saved))))
;;;###autoload
(defun whitespace-cleanup-region (s e)
nil)))
(defun whitespace-update-modeline (&optional whitespace-err)
- "Update modeline with whitespace errors.
+ "Update mode line with whitespace errors.
Also with whitespaces whose testing has been turned off."
(if whitespace-display-in-modeline
(progn