2008-01-31 16:08:29 +00:00
|
|
|
|
;;; whitespace.el --- minor mode to visualize TAB, (HARD) SPACE, NEWLINE
|
2008-01-17 12:46:55 +00:00
|
|
|
|
|
2012-01-05 09:46:05 +00:00
|
|
|
|
;; Copyright (C) 2000-2012 Free Software Foundation, Inc.
|
2008-01-17 12:46:55 +00:00
|
|
|
|
|
|
|
|
|
;; Author: Vinicius Jose Latorre <viniciusjl@ig.com.br>
|
|
|
|
|
;; Maintainer: Vinicius Jose Latorre <viniciusjl@ig.com.br>
|
|
|
|
|
;; Keywords: data, wp
|
2011-10-31 00:37:09 +00:00
|
|
|
|
;; Version: 13.2.2
|
2008-01-17 12:46:55 +00:00
|
|
|
|
;; X-URL: http://www.emacswiki.org/cgi-bin/wiki/ViniciusJoseLatorre
|
|
|
|
|
|
|
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
|
|
2008-05-06 08:06:51 +00:00
|
|
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
|
|
|
|
;; it under the terms of the GNU General Public License as published by
|
|
|
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
|
|
|
;; (at your option) any later version.
|
2008-01-17 12:46:55 +00:00
|
|
|
|
|
2008-05-06 08:06:51 +00:00
|
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
|
|
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
;; GNU General Public License for more details.
|
2008-01-17 12:46:55 +00:00
|
|
|
|
|
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
2008-05-06 08:06:51 +00:00
|
|
|
|
;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
|
2008-01-17 12:46:55 +00:00
|
|
|
|
|
|
|
|
|
;;; Commentary:
|
|
|
|
|
|
|
|
|
|
;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
|
|
|
;;
|
|
|
|
|
;; Introduction
|
|
|
|
|
;; ------------
|
|
|
|
|
;;
|
2008-01-21 12:45:58 +00:00
|
|
|
|
;; This package is a minor mode to visualize blanks (TAB, (HARD) SPACE
|
2008-01-17 12:46:55 +00:00
|
|
|
|
;; and NEWLINE).
|
|
|
|
|
;;
|
2008-01-31 16:08:29 +00:00
|
|
|
|
;; whitespace uses two ways to visualize blanks: faces and display
|
2008-01-17 12:46:55 +00:00
|
|
|
|
;; table.
|
|
|
|
|
;;
|
|
|
|
|
;; * Faces are used to highlight the background with a color.
|
2008-01-31 16:08:29 +00:00
|
|
|
|
;; whitespace uses font-lock to highlight blank characters.
|
2008-01-17 12:46:55 +00:00
|
|
|
|
;;
|
|
|
|
|
;; * Display table changes the way a character is displayed, that is,
|
|
|
|
|
;; it provides a visual mark for characters, for example, at the end
|
|
|
|
|
;; of line (?\xB6), at SPACEs (?\xB7) and at TABs (?\xBB).
|
|
|
|
|
;;
|
2008-04-26 12:38:54 +00:00
|
|
|
|
;; The `whitespace-style' variable selects which way blanks are
|
|
|
|
|
;; visualized.
|
2008-01-17 12:46:55 +00:00
|
|
|
|
;;
|
2008-01-31 16:08:29 +00:00
|
|
|
|
;; Note that when whitespace is turned on, whitespace saves the
|
2008-01-17 12:46:55 +00:00
|
|
|
|
;; font-lock state, that is, if font-lock is on or off. And
|
2008-01-31 16:08:29 +00:00
|
|
|
|
;; whitespace restores the font-lock state when it is turned off. So,
|
|
|
|
|
;; if whitespace is turned on and font-lock is off, whitespace also
|
2008-01-17 12:46:55 +00:00
|
|
|
|
;; turns on the font-lock to highlight blanks, but the font-lock will
|
2008-01-31 16:08:29 +00:00
|
|
|
|
;; be turned off when whitespace is turned off. Thus, turn on
|
|
|
|
|
;; font-lock before whitespace is on, if you want that font-lock
|
|
|
|
|
;; continues on after whitespace is turned off.
|
2008-01-17 12:46:55 +00:00
|
|
|
|
;;
|
2008-01-31 16:08:29 +00:00
|
|
|
|
;; When whitespace is on, it takes care of highlighting some special
|
2008-01-17 12:46:55 +00:00
|
|
|
|
;; characters over the default mechanism of `nobreak-char-display'
|
|
|
|
|
;; (which see) and `show-trailing-whitespace' (which see).
|
|
|
|
|
;;
|
2009-10-05 02:17:57 +00:00
|
|
|
|
;; The trailing spaces are not highlighted while point is at end of line.
|
|
|
|
|
;; Also the spaces at beginning of buffer are not highlighted while point is at
|
|
|
|
|
;; beginning of buffer; and the spaces at end of buffer are not highlighted
|
|
|
|
|
;; while point is at end of buffer.
|
|
|
|
|
;;
|
2008-01-31 16:08:29 +00:00
|
|
|
|
;; There are two ways of using whitespace: local and global.
|
2008-01-17 12:46:55 +00:00
|
|
|
|
;;
|
2008-01-31 16:08:29 +00:00
|
|
|
|
;; * Local whitespace affects only the current buffer.
|
2008-01-17 12:46:55 +00:00
|
|
|
|
;;
|
2008-01-31 16:08:29 +00:00
|
|
|
|
;; * Global whitespace affects all current and future buffers. That
|
|
|
|
|
;; is, if you turn on global whitespace and then create a new
|
|
|
|
|
;; buffer, the new buffer will also have whitespace on. The
|
|
|
|
|
;; `whitespace-global-modes' variable controls which major-mode will
|
|
|
|
|
;; be automagically turned on.
|
2008-01-17 12:46:55 +00:00
|
|
|
|
;;
|
|
|
|
|
;; You can mix the local and global usage without any conflict. But
|
2008-01-31 16:08:29 +00:00
|
|
|
|
;; local whitespace has priority over global whitespace. Whitespace
|
|
|
|
|
;; mode is active in a buffer if you have enabled it in that buffer or
|
|
|
|
|
;; if you have enabled it globally.
|
2008-01-17 12:46:55 +00:00
|
|
|
|
;;
|
2008-01-31 16:08:29 +00:00
|
|
|
|
;; When global and local whitespace are on:
|
2008-01-17 12:46:55 +00:00
|
|
|
|
;;
|
2008-01-31 16:08:29 +00:00
|
|
|
|
;; * if local whitespace is turned off, whitespace is turned off for
|
2008-01-17 12:46:55 +00:00
|
|
|
|
;; the current buffer only.
|
|
|
|
|
;;
|
2008-01-31 16:08:29 +00:00
|
|
|
|
;; * if global whitespace is turned off, whitespace continues on only
|
|
|
|
|
;; in the buffers in which local whitespace is on.
|
2008-01-17 12:46:55 +00:00
|
|
|
|
;;
|
2008-01-31 16:08:29 +00:00
|
|
|
|
;; To use whitespace, insert in your ~/.emacs:
|
2008-01-17 12:46:55 +00:00
|
|
|
|
;;
|
2009-12-10 22:58:40 +00:00
|
|
|
|
;; (require 'whitespace)
|
2008-01-17 12:46:55 +00:00
|
|
|
|
;;
|
2008-01-31 16:08:29 +00:00
|
|
|
|
;; Or autoload at least one of the commands`whitespace-mode',
|
|
|
|
|
;; `whitespace-toggle-options', `global-whitespace-mode' or
|
|
|
|
|
;; `global-whitespace-toggle-options'. For example:
|
2008-01-17 12:46:55 +00:00
|
|
|
|
;;
|
2008-01-31 16:08:29 +00:00
|
|
|
|
;; (autoload 'whitespace-mode "whitespace"
|
|
|
|
|
;; "Toggle whitespace visualization." t)
|
|
|
|
|
;; (autoload 'whitespace-toggle-options "whitespace"
|
|
|
|
|
;; "Toggle local `whitespace-mode' options." t)
|
2008-01-17 12:46:55 +00:00
|
|
|
|
;;
|
2008-01-31 16:08:29 +00:00
|
|
|
|
;; whitespace was inspired by:
|
2008-01-17 12:46:55 +00:00
|
|
|
|
;;
|
2008-01-25 14:09:57 +00:00
|
|
|
|
;; whitespace.el Rajesh Vaidheeswarran <rv@gnu.org>
|
|
|
|
|
;; Warn about and clean bogus whitespaces in the file
|
|
|
|
|
;; (inspired the idea to warn and clean some blanks)
|
2008-01-31 16:08:29 +00:00
|
|
|
|
;; This was the original `whitespace.el' which was replaced by
|
|
|
|
|
;; `blank-mode.el'. And later `blank-mode.el' was renamed to
|
|
|
|
|
;; `whitespace.el'.
|
2008-01-25 14:09:57 +00:00
|
|
|
|
;;
|
2008-01-17 12:46:55 +00:00
|
|
|
|
;; show-whitespace-mode.el Aurelien Tisne <aurelien.tisne@free.fr>
|
|
|
|
|
;; Simple mode to highlight whitespaces
|
|
|
|
|
;; (inspired the idea to use font-lock)
|
|
|
|
|
;;
|
|
|
|
|
;; whitespace-mode.el Lawrence Mitchell <wence@gmx.li>
|
|
|
|
|
;; Major mode for editing Whitespace
|
|
|
|
|
;; (inspired the idea to use display table)
|
|
|
|
|
;;
|
|
|
|
|
;; visws.el Miles Bader <miles@gnu.org>
|
|
|
|
|
;; Make whitespace visible
|
|
|
|
|
;; (handle display table, his code was modified, but the main
|
|
|
|
|
;; idea was kept)
|
|
|
|
|
;;
|
|
|
|
|
;;
|
2008-01-31 16:08:29 +00:00
|
|
|
|
;; Using whitespace
|
2008-01-17 12:46:55 +00:00
|
|
|
|
;; ----------------
|
|
|
|
|
;;
|
|
|
|
|
;; There is no problem if you mix local and global minor mode usage.
|
|
|
|
|
;;
|
2008-01-31 16:08:29 +00:00
|
|
|
|
;; * LOCAL whitespace:
|
|
|
|
|
;; + To toggle whitespace options locally, type:
|
2008-01-17 12:46:55 +00:00
|
|
|
|
;;
|
2008-01-31 16:08:29 +00:00
|
|
|
|
;; M-x whitespace-toggle-options RET
|
2008-01-17 12:46:55 +00:00
|
|
|
|
;;
|
2008-01-31 16:08:29 +00:00
|
|
|
|
;; + To activate whitespace locally, type:
|
2008-01-17 12:46:55 +00:00
|
|
|
|
;;
|
2008-01-31 16:08:29 +00:00
|
|
|
|
;; C-u 1 M-x whitespace-mode RET
|
2008-01-17 12:46:55 +00:00
|
|
|
|
;;
|
2008-01-31 16:08:29 +00:00
|
|
|
|
;; + To deactivate whitespace locally, type:
|
2008-01-17 12:46:55 +00:00
|
|
|
|
;;
|
2008-01-31 16:08:29 +00:00
|
|
|
|
;; C-u 0 M-x whitespace-mode RET
|
2008-01-17 12:46:55 +00:00
|
|
|
|
;;
|
2008-01-31 16:08:29 +00:00
|
|
|
|
;; + To toggle whitespace locally, type:
|
2008-01-17 12:46:55 +00:00
|
|
|
|
;;
|
2008-01-31 16:08:29 +00:00
|
|
|
|
;; M-x whitespace-mode RET
|
2008-01-17 12:46:55 +00:00
|
|
|
|
;;
|
2008-01-31 16:08:29 +00:00
|
|
|
|
;; * GLOBAL whitespace:
|
|
|
|
|
;; + To toggle whitespace options globally, type:
|
2008-01-17 12:46:55 +00:00
|
|
|
|
;;
|
2008-01-31 16:08:29 +00:00
|
|
|
|
;; M-x global-whitespace-toggle-options RET
|
2008-01-17 12:46:55 +00:00
|
|
|
|
;;
|
2008-01-31 16:08:29 +00:00
|
|
|
|
;; + To activate whitespace globally, type:
|
2008-01-17 12:46:55 +00:00
|
|
|
|
;;
|
2008-01-31 16:08:29 +00:00
|
|
|
|
;; C-u 1 M-x global-whitespace-mode RET
|
2008-01-17 12:46:55 +00:00
|
|
|
|
;;
|
2008-01-31 16:08:29 +00:00
|
|
|
|
;; + To deactivate whitespace globally, type:
|
2008-01-17 12:46:55 +00:00
|
|
|
|
;;
|
2008-01-31 16:08:29 +00:00
|
|
|
|
;; C-u 0 M-x global-whitespace-mode RET
|
2008-01-17 12:46:55 +00:00
|
|
|
|
;;
|
2008-01-31 16:08:29 +00:00
|
|
|
|
;; + To toggle whitespace globally, type:
|
2008-01-17 12:46:55 +00:00
|
|
|
|
;;
|
2008-01-31 16:08:29 +00:00
|
|
|
|
;; M-x global-whitespace-mode RET
|
2008-01-17 12:46:55 +00:00
|
|
|
|
;;
|
2008-01-25 14:09:57 +00:00
|
|
|
|
;; There are also the following useful commands:
|
|
|
|
|
;;
|
2008-07-24 04:12:27 +00:00
|
|
|
|
;; `whitespace-newline-mode'
|
2012-06-02 10:56:09 +00:00
|
|
|
|
;; Toggle NEWLINE minor mode visualization ("nl" on mode line).
|
2008-07-24 04:12:27 +00:00
|
|
|
|
;;
|
|
|
|
|
;; `global-whitespace-newline-mode'
|
2012-06-02 10:56:09 +00:00
|
|
|
|
;; Toggle NEWLINE global minor mode visualization ("NL" on mode line).
|
2008-07-24 04:12:27 +00:00
|
|
|
|
;;
|
2008-03-01 19:00:24 +00:00
|
|
|
|
;; `whitespace-report'
|
|
|
|
|
;; Report some blank problems in buffer.
|
|
|
|
|
;;
|
|
|
|
|
;; `whitespace-report-region'
|
|
|
|
|
;; Report some blank problems in a region.
|
|
|
|
|
;;
|
2008-01-31 16:08:29 +00:00
|
|
|
|
;; `whitespace-cleanup'
|
2008-01-25 14:09:57 +00:00
|
|
|
|
;; Cleanup some blank problems in all buffer or at region.
|
|
|
|
|
;;
|
2008-01-31 16:08:29 +00:00
|
|
|
|
;; `whitespace-cleanup-region'
|
2008-01-25 14:09:57 +00:00
|
|
|
|
;; Cleanup some blank problems at region.
|
|
|
|
|
;;
|
|
|
|
|
;; The problems, which are cleaned up, are:
|
|
|
|
|
;;
|
|
|
|
|
;; 1. empty lines at beginning of buffer.
|
|
|
|
|
;; 2. empty lines at end of buffer.
|
2008-04-26 11:38:50 +00:00
|
|
|
|
;; If `whitespace-style' includes the value `empty', remove all
|
|
|
|
|
;; empty lines at beginning and/or end of buffer.
|
2008-01-25 14:09:57 +00:00
|
|
|
|
;;
|
|
|
|
|
;; 3. 8 or more SPACEs at beginning of line.
|
2008-04-26 11:38:50 +00:00
|
|
|
|
;; If `whitespace-style' includes the value `indentation':
|
2008-04-16 03:41:17 +00:00
|
|
|
|
;; replace 8 or more SPACEs at beginning of line by TABs, if
|
|
|
|
|
;; `indent-tabs-mode' is non-nil; otherwise, replace TABs by
|
|
|
|
|
;; SPACEs.
|
2008-04-26 11:38:50 +00:00
|
|
|
|
;; If `whitespace-style' includes the value `indentation::tab',
|
|
|
|
|
;; replace 8 or more SPACEs at beginning of line by TABs.
|
|
|
|
|
;; If `whitespace-style' includes the value `indentation::space',
|
|
|
|
|
;; replace TABs by SPACEs.
|
2008-01-25 14:09:57 +00:00
|
|
|
|
;;
|
|
|
|
|
;; 4. SPACEs before TAB.
|
2008-04-26 11:38:50 +00:00
|
|
|
|
;; If `whitespace-style' includes the value `space-before-tab':
|
|
|
|
|
;; replace SPACEs by TABs, if `indent-tabs-mode' is non-nil;
|
|
|
|
|
;; otherwise, replace TABs by SPACEs.
|
|
|
|
|
;; If `whitespace-style' includes the value
|
2008-04-16 03:41:17 +00:00
|
|
|
|
;; `space-before-tab::tab', replace SPACEs by TABs.
|
2008-04-26 11:38:50 +00:00
|
|
|
|
;; If `whitespace-style' includes the value
|
2008-04-16 03:41:17 +00:00
|
|
|
|
;; `space-before-tab::space', replace TABs by SPACEs.
|
2008-01-25 14:09:57 +00:00
|
|
|
|
;;
|
|
|
|
|
;; 5. SPACEs or TABs at end of line.
|
2008-04-26 11:38:50 +00:00
|
|
|
|
;; If `whitespace-style' includes the value `trailing', remove all
|
|
|
|
|
;; SPACEs or TABs at end of line.
|
2008-01-25 14:09:57 +00:00
|
|
|
|
;;
|
|
|
|
|
;; 6. 8 or more SPACEs after TAB.
|
2008-04-26 11:38:50 +00:00
|
|
|
|
;; If `whitespace-style' includes the value `space-after-tab':
|
|
|
|
|
;; replace SPACEs by TABs, if `indent-tabs-mode' is non-nil;
|
|
|
|
|
;; otherwise, replace TABs by SPACEs.
|
|
|
|
|
;; If `whitespace-style' includes the value `space-after-tab::tab',
|
|
|
|
|
;; replace SPACEs by TABs.
|
|
|
|
|
;; If `whitespace-style' includes the value
|
2008-04-16 03:41:17 +00:00
|
|
|
|
;; `space-after-tab::space', replace TABs by SPACEs.
|
2008-01-25 14:09:57 +00:00
|
|
|
|
;;
|
2008-01-17 12:46:55 +00:00
|
|
|
|
;;
|
|
|
|
|
;; Hooks
|
|
|
|
|
;; -----
|
|
|
|
|
;;
|
2008-01-31 16:08:29 +00:00
|
|
|
|
;; whitespace has the following hook variables:
|
2008-01-17 12:46:55 +00:00
|
|
|
|
;;
|
2008-01-31 16:08:29 +00:00
|
|
|
|
;; `whitespace-mode-hook'
|
|
|
|
|
;; It is evaluated always when whitespace is turned on locally.
|
2008-01-17 12:46:55 +00:00
|
|
|
|
;;
|
2008-01-31 16:08:29 +00:00
|
|
|
|
;; `global-whitespace-mode-hook'
|
|
|
|
|
;; It is evaluated always when whitespace is turned on globally.
|
2008-01-17 12:46:55 +00:00
|
|
|
|
;;
|
2008-01-31 16:08:29 +00:00
|
|
|
|
;; `whitespace-load-hook'
|
|
|
|
|
;; It is evaluated after whitespace package is loaded.
|
2008-01-17 12:46:55 +00:00
|
|
|
|
;;
|
|
|
|
|
;;
|
|
|
|
|
;; Options
|
|
|
|
|
;; -------
|
|
|
|
|
;;
|
2008-01-31 16:08:29 +00:00
|
|
|
|
;; Below it's shown a brief description of whitespace options, please,
|
2008-01-17 12:46:55 +00:00
|
|
|
|
;; see the options declaration in the code for a long documentation.
|
|
|
|
|
;;
|
2008-04-26 11:38:50 +00:00
|
|
|
|
;; `whitespace-style' Specify which kind of blank is
|
|
|
|
|
;; visualized.
|
2008-01-17 12:46:55 +00:00
|
|
|
|
;;
|
2008-01-31 16:08:29 +00:00
|
|
|
|
;; `whitespace-space' Face used to visualize SPACE.
|
2008-01-17 12:46:55 +00:00
|
|
|
|
;;
|
2008-01-31 16:08:29 +00:00
|
|
|
|
;; `whitespace-hspace' Face used to visualize HARD SPACE.
|
2008-01-17 12:46:55 +00:00
|
|
|
|
;;
|
2008-01-31 16:08:29 +00:00
|
|
|
|
;; `whitespace-tab' Face used to visualize TAB.
|
2008-01-17 12:46:55 +00:00
|
|
|
|
;;
|
2008-01-31 16:08:29 +00:00
|
|
|
|
;; `whitespace-newline' Face used to visualize NEWLINE char
|
2008-01-17 12:46:55 +00:00
|
|
|
|
;; mapping.
|
|
|
|
|
;;
|
2008-01-31 16:08:29 +00:00
|
|
|
|
;; `whitespace-trailing' Face used to visualize trailing
|
2008-01-17 12:46:55 +00:00
|
|
|
|
;; blanks.
|
|
|
|
|
;;
|
2008-01-31 16:08:29 +00:00
|
|
|
|
;; `whitespace-line' Face used to visualize "long" lines.
|
2008-01-17 12:46:55 +00:00
|
|
|
|
;;
|
2008-01-31 16:08:29 +00:00
|
|
|
|
;; `whitespace-space-before-tab' Face used to visualize SPACEs
|
|
|
|
|
;; before TAB.
|
2008-01-17 12:46:55 +00:00
|
|
|
|
;;
|
2008-01-31 16:08:29 +00:00
|
|
|
|
;; `whitespace-indentation' Face used to visualize 8 or more
|
2008-01-25 14:09:57 +00:00
|
|
|
|
;; SPACEs at beginning of line.
|
|
|
|
|
;;
|
2008-01-31 16:08:29 +00:00
|
|
|
|
;; `whitespace-empty' Face used to visualize empty lines at
|
2008-01-25 14:09:57 +00:00
|
|
|
|
;; beginning and/or end of buffer.
|
|
|
|
|
;;
|
2008-01-31 16:08:29 +00:00
|
|
|
|
;; `whitespace-space-after-tab' Face used to visualize 8 or more
|
2008-01-25 14:09:57 +00:00
|
|
|
|
;; SPACEs after TAB.
|
|
|
|
|
;;
|
2008-01-31 16:08:29 +00:00
|
|
|
|
;; `whitespace-space-regexp' Specify SPACE characters regexp.
|
2008-01-17 12:46:55 +00:00
|
|
|
|
;;
|
2008-01-31 16:08:29 +00:00
|
|
|
|
;; `whitespace-hspace-regexp' Specify HARD SPACE characters regexp.
|
2008-01-17 12:46:55 +00:00
|
|
|
|
;;
|
2008-01-31 16:08:29 +00:00
|
|
|
|
;; `whitespace-tab-regexp' Specify TAB characters regexp.
|
2008-01-17 12:46:55 +00:00
|
|
|
|
;;
|
2008-01-31 16:08:29 +00:00
|
|
|
|
;; `whitespace-trailing-regexp' Specify trailing characters regexp.
|
2008-01-17 12:46:55 +00:00
|
|
|
|
;;
|
2008-01-31 16:08:29 +00:00
|
|
|
|
;; `whitespace-space-before-tab-regexp' Specify SPACEs before TAB
|
2008-01-17 12:46:55 +00:00
|
|
|
|
;; regexp.
|
|
|
|
|
;;
|
2008-01-31 16:08:29 +00:00
|
|
|
|
;; `whitespace-indentation-regexp' Specify regexp for 8 or more
|
|
|
|
|
;; SPACEs at beginning of line.
|
2008-01-25 14:09:57 +00:00
|
|
|
|
;;
|
2008-01-31 16:08:29 +00:00
|
|
|
|
;; `whitespace-empty-at-bob-regexp' Specify regexp for empty lines
|
|
|
|
|
;; at beginning of buffer.
|
2008-01-25 14:09:57 +00:00
|
|
|
|
;;
|
2008-01-31 16:08:29 +00:00
|
|
|
|
;; `whitespace-empty-at-eob-regexp' Specify regexp for empty lines
|
|
|
|
|
;; at end of buffer.
|
2008-01-25 14:09:57 +00:00
|
|
|
|
;;
|
2008-01-31 16:08:29 +00:00
|
|
|
|
;; `whitespace-space-after-tab-regexp' Specify regexp for 8 or more
|
2008-01-25 14:09:57 +00:00
|
|
|
|
;; SPACEs after TAB.
|
|
|
|
|
;;
|
2008-01-31 16:08:29 +00:00
|
|
|
|
;; `whitespace-line-column' Specify column beyond which the line
|
2008-01-17 12:46:55 +00:00
|
|
|
|
;; is highlighted.
|
|
|
|
|
;;
|
2008-01-31 16:08:29 +00:00
|
|
|
|
;; `whitespace-display-mappings' Specify an alist of mappings
|
|
|
|
|
;; for displaying characters.
|
2008-01-17 12:46:55 +00:00
|
|
|
|
;;
|
2008-02-01 18:52:51 +00:00
|
|
|
|
;; `whitespace-global-modes' Modes for which global
|
|
|
|
|
;; `whitespace-mode' is automagically
|
|
|
|
|
;; turned on.
|
2008-01-17 12:46:55 +00:00
|
|
|
|
;;
|
2008-03-01 19:00:24 +00:00
|
|
|
|
;; `whitespace-action' Specify which action is taken when a
|
2008-10-02 00:49:49 +00:00
|
|
|
|
;; buffer is visited or written.
|
2008-03-01 19:00:24 +00:00
|
|
|
|
;;
|
2008-01-17 12:46:55 +00:00
|
|
|
|
;;
|
2012-07-25 05:48:19 +00:00
|
|
|
|
;; Acknowledgments
|
|
|
|
|
;; ---------------
|
2008-01-17 12:46:55 +00:00
|
|
|
|
;;
|
2011-04-30 15:15:07 +00:00
|
|
|
|
;; Thanks to felix (EmacsWiki) for keeping highlight when switching between
|
|
|
|
|
;; major modes on a file.
|
|
|
|
|
;;
|
2008-07-29 02:07:26 +00:00
|
|
|
|
;; Thanks to David Reitter <david.reitter@gmail.com> for suggesting a
|
|
|
|
|
;; `whitespace-newline' initialization with low contrast relative to
|
|
|
|
|
;; the background color.
|
|
|
|
|
;;
|
2008-04-16 03:41:17 +00:00
|
|
|
|
;; Thanks to Stephen Deasey <sdeasey@gmail.com> for the
|
|
|
|
|
;; `indent-tabs-mode' usage suggestion.
|
|
|
|
|
;;
|
|
|
|
|
;; Thanks to Eric Cooper <ecc@cmu.edu> for the suggestion to have hook
|
2008-10-02 00:49:49 +00:00
|
|
|
|
;; actions when buffer is written as the original whitespace package
|
|
|
|
|
;; had.
|
2008-03-01 19:00:24 +00:00
|
|
|
|
;;
|
2008-01-26 01:47:21 +00:00
|
|
|
|
;; Thanks to nschum (EmacsWiki) for the idea about highlight "long"
|
|
|
|
|
;; lines tail. See EightyColumnRule (EmacsWiki).
|
|
|
|
|
;;
|
2008-01-17 12:46:55 +00:00
|
|
|
|
;; Thanks to Juri Linkov <juri@jurta.org> for suggesting:
|
|
|
|
|
;; * `define-minor-mode'.
|
2008-01-31 16:08:29 +00:00
|
|
|
|
;; * `global-whitespace-*' name for global commands.
|
2008-01-17 12:46:55 +00:00
|
|
|
|
;;
|
|
|
|
|
;; Thanks to Robert J. Chassell <bob@gnu.org> for doc fix and testing.
|
|
|
|
|
;;
|
|
|
|
|
;; Thanks to Drew Adams <drew.adams@oracle.com> for toggle commands
|
|
|
|
|
;; suggestion.
|
|
|
|
|
;;
|
|
|
|
|
;; Thanks to Antti Kaihola <antti.kaihola@linux-aktivaattori.org> for
|
|
|
|
|
;; helping to fix `find-file-hooks' reference.
|
|
|
|
|
;;
|
|
|
|
|
;; Thanks to Andreas Roehler <andreas.roehler@easy-emacs.de> for
|
|
|
|
|
;; indicating defface byte-compilation warnings.
|
|
|
|
|
;;
|
|
|
|
|
;; Thanks to TimOCallaghan (EmacsWiki) for the idea about highlight
|
2008-01-26 01:47:21 +00:00
|
|
|
|
;; "long" lines. See EightyColumnRule (EmacsWiki).
|
2008-01-17 12:46:55 +00:00
|
|
|
|
;;
|
|
|
|
|
;; Thanks to Yanghui Bian <yanghuibian@gmail.com> for indicating a new
|
2008-08-06 03:35:04 +00:00
|
|
|
|
;; NEWLINE character mapping.
|
2008-01-17 12:46:55 +00:00
|
|
|
|
;;
|
|
|
|
|
;; Thanks to Pete Forman <pete.forman@westgeo.com> for indicating
|
2008-01-31 16:08:29 +00:00
|
|
|
|
;; whitespace-mode.el on XEmacs.
|
2008-01-17 12:46:55 +00:00
|
|
|
|
;;
|
|
|
|
|
;; Thanks to Miles Bader <miles@gnu.org> for handling display table via
|
|
|
|
|
;; visws.el (his code was modified, but the main idea was kept).
|
|
|
|
|
;;
|
|
|
|
|
;; Thanks to:
|
2008-01-31 16:08:29 +00:00
|
|
|
|
;; Rajesh Vaidheeswarran <rv@gnu.org> (original) whitespace.el
|
2008-01-17 12:46:55 +00:00
|
|
|
|
;; Aurelien Tisne <aurelien.tisne@free.fr> show-whitespace-mode.el
|
|
|
|
|
;; Lawrence Mitchell <wence@gmx.li> whitespace-mode.el
|
|
|
|
|
;; Miles Bader <miles@gnu.org> visws.el
|
|
|
|
|
;; And to all people who contributed with them.
|
|
|
|
|
;;
|
|
|
|
|
;;
|
|
|
|
|
;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
|
|
|
|
|
|
|
|
;;; code:
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
|
|
|
;;;; User Variables:
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;; Interface to the command system
|
|
|
|
|
|
|
|
|
|
|
2008-01-31 16:08:29 +00:00
|
|
|
|
(defgroup whitespace nil
|
2008-01-21 12:45:58 +00:00
|
|
|
|
"Visualize blanks (TAB, (HARD) SPACE and NEWLINE)."
|
2008-01-31 16:08:29 +00:00
|
|
|
|
:link '(emacs-library-link :tag "Source Lisp File" "whitespace.el")
|
(whitespace): Set :version tag to 23.1.
(whitespace-turn-off, whitespace-toggle-options): Fix typos.
(whitespace-style, whitespace-chars, whitespace-space, whitespace-hspace,
whitespace-tab, whitespace-newline, whitespace-trailing, whitespace-line,
whitespace-space-before-tab, whitespace-indentation, whitespace-empty,
whitespace-space-after-tab, whitespace-hspace-regexp, whitespace-space-regexp,
whitespace-tab-regexp, whitespace-trailing-regexp,
whitespace-space-before-tab-regexp, whitespace-indentation-regexp,
whitespace-empty-at-bob-regexp, whitespace-empty-at-eob-regexp,
whitespace-space-after-tab-regexp, whitespace-line-column,
whitespace-display-mappings, global-whitespace-toggle-options,
whitespace-cleanup, whitespace-cleanup-region, whitespace-interactive-char):
Doc fixes.
2008-02-01 14:44:44 +00:00
|
|
|
|
:version "23.1"
|
2010-03-12 17:47:22 +00:00
|
|
|
|
:group 'convenience)
|
2008-01-17 12:46:55 +00:00
|
|
|
|
|
|
|
|
|
|
2008-04-26 11:38:50 +00:00
|
|
|
|
(defcustom whitespace-style
|
2010-08-25 02:27:58 +00:00
|
|
|
|
'(face
|
|
|
|
|
tabs spaces trailing lines space-before-tab newline
|
|
|
|
|
indentation empty space-after-tab
|
|
|
|
|
space-mark tab-mark newline-mark)
|
2008-12-03 05:48:14 +00:00
|
|
|
|
"Specify which kind of blank is visualized.
|
2008-01-17 12:46:55 +00:00
|
|
|
|
|
(whitespace): Set :version tag to 23.1.
(whitespace-turn-off, whitespace-toggle-options): Fix typos.
(whitespace-style, whitespace-chars, whitespace-space, whitespace-hspace,
whitespace-tab, whitespace-newline, whitespace-trailing, whitespace-line,
whitespace-space-before-tab, whitespace-indentation, whitespace-empty,
whitespace-space-after-tab, whitespace-hspace-regexp, whitespace-space-regexp,
whitespace-tab-regexp, whitespace-trailing-regexp,
whitespace-space-before-tab-regexp, whitespace-indentation-regexp,
whitespace-empty-at-bob-regexp, whitespace-empty-at-eob-regexp,
whitespace-space-after-tab-regexp, whitespace-line-column,
whitespace-display-mappings, global-whitespace-toggle-options,
whitespace-cleanup, whitespace-cleanup-region, whitespace-interactive-char):
Doc fixes.
2008-02-01 14:44:44 +00:00
|
|
|
|
It's a list containing some or all of the following values:
|
2008-01-17 12:46:55 +00:00
|
|
|
|
|
2010-08-25 02:27:58 +00:00
|
|
|
|
face enable all visualization via faces (see below).
|
|
|
|
|
|
2008-04-26 11:38:50 +00:00
|
|
|
|
trailing trailing blanks are visualized via faces.
|
2010-08-25 02:27:58 +00:00
|
|
|
|
It has effect only if `face' (see above)
|
|
|
|
|
is present in `whitespace-style'.
|
2008-01-17 12:46:55 +00:00
|
|
|
|
|
2008-04-26 11:38:50 +00:00
|
|
|
|
tabs TABs are visualized via faces.
|
2010-08-25 02:27:58 +00:00
|
|
|
|
It has effect only if `face' (see above)
|
|
|
|
|
is present in `whitespace-style'.
|
2008-01-17 12:46:55 +00:00
|
|
|
|
|
2008-04-26 11:38:50 +00:00
|
|
|
|
spaces SPACEs and HARD SPACEs are visualized via
|
|
|
|
|
faces.
|
2010-08-25 02:27:58 +00:00
|
|
|
|
It has effect only if `face' (see above)
|
|
|
|
|
is present in `whitespace-style'.
|
2008-01-17 12:46:55 +00:00
|
|
|
|
|
2010-01-18 04:39:40 +00:00
|
|
|
|
lines lines which have columns beyond
|
2008-04-26 11:38:50 +00:00
|
|
|
|
`whitespace-line-column' are highlighted via
|
2010-01-18 04:39:40 +00:00
|
|
|
|
faces.
|
2008-01-26 01:47:21 +00:00
|
|
|
|
Whole line is highlighted.
|
2008-04-26 11:38:50 +00:00
|
|
|
|
It has precedence over `lines-tail' (see
|
|
|
|
|
below).
|
2010-08-25 02:27:58 +00:00
|
|
|
|
It has effect only if `face' (see above)
|
|
|
|
|
is present in `whitespace-style'.
|
2008-01-26 01:47:21 +00:00
|
|
|
|
|
2010-01-18 04:39:40 +00:00
|
|
|
|
lines-tail lines which have columns beyond
|
2008-04-26 11:38:50 +00:00
|
|
|
|
`whitespace-line-column' are highlighted via
|
|
|
|
|
faces.
|
2008-01-26 01:47:21 +00:00
|
|
|
|
But only the part of line which goes
|
2008-01-31 16:08:29 +00:00
|
|
|
|
beyond `whitespace-line-column' column.
|
2008-01-26 01:47:21 +00:00
|
|
|
|
It has effect only if `lines' (see above)
|
2010-08-25 02:27:58 +00:00
|
|
|
|
is not present in `whitespace-style'
|
|
|
|
|
and if `face' (see above) is present in
|
|
|
|
|
`whitespace-style'.
|
2008-01-17 12:46:55 +00:00
|
|
|
|
|
2008-04-26 11:38:50 +00:00
|
|
|
|
newline NEWLINEs are visualized via faces.
|
2010-08-25 02:27:58 +00:00
|
|
|
|
It has effect only if `face' (see above)
|
|
|
|
|
is present in `whitespace-style'.
|
2008-01-17 12:46:55 +00:00
|
|
|
|
|
2008-01-25 14:09:57 +00:00
|
|
|
|
empty empty lines at beginning and/or end of buffer
|
2008-04-26 11:38:50 +00:00
|
|
|
|
are visualized via faces.
|
2010-08-25 02:27:58 +00:00
|
|
|
|
It has effect only if `face' (see above)
|
|
|
|
|
is present in `whitespace-style'.
|
2008-01-25 14:09:57 +00:00
|
|
|
|
|
2008-04-16 03:41:17 +00:00
|
|
|
|
indentation::tab 8 or more SPACEs at beginning of line are
|
2008-04-26 11:38:50 +00:00
|
|
|
|
visualized via faces.
|
2010-08-25 02:27:58 +00:00
|
|
|
|
It has effect only if `face' (see above)
|
|
|
|
|
is present in `whitespace-style'.
|
2008-04-16 03:41:17 +00:00
|
|
|
|
|
2008-04-26 11:38:50 +00:00
|
|
|
|
indentation::space TABs at beginning of line are visualized via
|
|
|
|
|
faces.
|
2010-08-25 02:27:58 +00:00
|
|
|
|
It has effect only if `face' (see above)
|
|
|
|
|
is present in `whitespace-style'.
|
2008-01-25 14:09:57 +00:00
|
|
|
|
|
2008-04-16 03:41:17 +00:00
|
|
|
|
indentation 8 or more SPACEs at beginning of line are
|
|
|
|
|
visualized, if `indent-tabs-mode' (which see)
|
|
|
|
|
is non-nil; otherwise, TABs at beginning of
|
2008-04-26 11:38:50 +00:00
|
|
|
|
line are visualized via faces.
|
2010-08-25 02:27:58 +00:00
|
|
|
|
It has effect only if `face' (see above)
|
|
|
|
|
is present in `whitespace-style'.
|
2008-04-16 03:41:17 +00:00
|
|
|
|
|
|
|
|
|
space-after-tab::tab 8 or more SPACEs after a TAB are
|
2008-04-26 11:38:50 +00:00
|
|
|
|
visualized via faces.
|
2010-08-25 02:27:58 +00:00
|
|
|
|
It has effect only if `face' (see above)
|
|
|
|
|
is present in `whitespace-style'.
|
2008-04-16 03:41:17 +00:00
|
|
|
|
|
2009-08-16 14:46:39 +00:00
|
|
|
|
space-after-tab::space TABs are visualized when 8 or more
|
|
|
|
|
SPACEs occur after a TAB, via faces.
|
2010-08-25 02:27:58 +00:00
|
|
|
|
It has effect only if `face' (see above)
|
|
|
|
|
is present in `whitespace-style'.
|
2008-04-16 03:41:17 +00:00
|
|
|
|
|
|
|
|
|
space-after-tab 8 or more SPACEs after a TAB are
|
|
|
|
|
visualized, if `indent-tabs-mode'
|
|
|
|
|
(which see) is non-nil; otherwise,
|
2008-04-26 11:38:50 +00:00
|
|
|
|
the TABs are visualized via faces.
|
2010-08-25 02:27:58 +00:00
|
|
|
|
It has effect only if `face' (see above)
|
|
|
|
|
is present in `whitespace-style'.
|
2008-04-16 03:41:17 +00:00
|
|
|
|
|
2008-04-26 11:38:50 +00:00
|
|
|
|
space-before-tab::tab SPACEs before TAB are visualized via
|
|
|
|
|
faces.
|
2010-08-25 02:27:58 +00:00
|
|
|
|
It has effect only if `face' (see above)
|
|
|
|
|
is present in `whitespace-style'.
|
2008-01-17 12:46:55 +00:00
|
|
|
|
|
2009-08-16 14:46:39 +00:00
|
|
|
|
space-before-tab::space TABs are visualized when SPACEs occur
|
|
|
|
|
before TAB, via faces.
|
2010-08-25 02:27:58 +00:00
|
|
|
|
It has effect only if `face' (see above)
|
|
|
|
|
is present in `whitespace-style'.
|
2008-01-17 12:46:55 +00:00
|
|
|
|
|
2008-04-16 03:41:17 +00:00
|
|
|
|
space-before-tab SPACEs before TAB are visualized, if
|
|
|
|
|
`indent-tabs-mode' (which see) is
|
|
|
|
|
non-nil; otherwise, the TABs are
|
2008-04-26 11:38:50 +00:00
|
|
|
|
visualized via faces.
|
2010-08-25 02:27:58 +00:00
|
|
|
|
It has effect only if `face' (see above)
|
|
|
|
|
is present in `whitespace-style'.
|
2008-04-26 11:38:50 +00:00
|
|
|
|
|
|
|
|
|
space-mark SPACEs and HARD SPACEs are visualized via
|
|
|
|
|
display table.
|
|
|
|
|
|
|
|
|
|
tab-mark TABs are visualized via display table.
|
|
|
|
|
|
|
|
|
|
newline-mark NEWLINEs are visualized via display table.
|
2008-04-16 03:41:17 +00:00
|
|
|
|
|
|
|
|
|
Any other value is ignored.
|
|
|
|
|
|
2008-04-26 11:38:50 +00:00
|
|
|
|
If nil, don't visualize TABs, (HARD) SPACEs and NEWLINEs via faces and
|
|
|
|
|
via display table.
|
2008-04-16 03:41:17 +00:00
|
|
|
|
|
2010-01-18 04:39:40 +00:00
|
|
|
|
There is an evaluation order for some values, if they are
|
2008-04-26 11:38:50 +00:00
|
|
|
|
included in `whitespace-style' list. For example, if
|
2008-04-16 03:41:17 +00:00
|
|
|
|
indentation, indentation::tab and/or indentation::space are
|
2008-04-26 11:38:50 +00:00
|
|
|
|
included in `whitespace-style' list. The evaluation order for
|
|
|
|
|
these values is:
|
2008-04-16 03:41:17 +00:00
|
|
|
|
|
|
|
|
|
* For indentation:
|
|
|
|
|
1. indentation
|
|
|
|
|
2. indentation::tab
|
|
|
|
|
3. indentation::space
|
|
|
|
|
|
|
|
|
|
* For SPACEs after TABs:
|
|
|
|
|
1. space-after-tab
|
|
|
|
|
2. space-after-tab::tab
|
|
|
|
|
3. space-after-tab::space
|
|
|
|
|
|
|
|
|
|
* For SPACEs before TABs:
|
|
|
|
|
1. space-before-tab
|
|
|
|
|
2. space-before-tab::tab
|
|
|
|
|
3. space-before-tab::space
|
|
|
|
|
|
|
|
|
|
So, for example, if indentation and indentation::space are
|
2008-04-26 11:38:50 +00:00
|
|
|
|
included in `whitespace-style' list, the indentation value is
|
|
|
|
|
evaluated instead of indentation::space value.
|
|
|
|
|
|
2010-08-25 02:27:58 +00:00
|
|
|
|
One reason for not visualize spaces via faces (if `face' is not
|
|
|
|
|
included in `whitespace-style') is to use exclusively for
|
2011-11-15 07:55:13 +00:00
|
|
|
|
cleaning up a buffer. See `whitespace-cleanup' and
|
2010-08-25 02:27:58 +00:00
|
|
|
|
`whitespace-cleanup-region' for documentation.
|
|
|
|
|
|
2008-04-26 11:38:50 +00:00
|
|
|
|
See also `whitespace-display-mappings' for documentation."
|
|
|
|
|
:type '(repeat :tag "Kind of Blank"
|
2008-04-16 03:41:17 +00:00
|
|
|
|
(choice :tag "Kind of Blank Face"
|
2010-08-27 03:24:17 +00:00
|
|
|
|
(const :tag "(Face) Face visualization"
|
|
|
|
|
face)
|
2008-04-26 11:38:50 +00:00
|
|
|
|
(const :tag "(Face) Trailing TABs, SPACEs and HARD SPACEs"
|
2008-01-17 12:46:55 +00:00
|
|
|
|
trailing)
|
2008-04-26 11:38:50 +00:00
|
|
|
|
(const :tag "(Face) SPACEs and HARD SPACEs"
|
|
|
|
|
spaces)
|
|
|
|
|
(const :tag "(Face) TABs" tabs)
|
|
|
|
|
(const :tag "(Face) Lines" lines)
|
|
|
|
|
(const :tag "(Face) SPACEs before TAB"
|
2008-01-17 12:46:55 +00:00
|
|
|
|
space-before-tab)
|
2008-04-26 11:38:50 +00:00
|
|
|
|
(const :tag "(Face) NEWLINEs" newline)
|
|
|
|
|
(const :tag "(Face) Indentation SPACEs"
|
|
|
|
|
indentation)
|
|
|
|
|
(const :tag "(Face) Empty Lines At BOB And/Or EOB"
|
2008-01-25 14:09:57 +00:00
|
|
|
|
empty)
|
2008-04-26 11:38:50 +00:00
|
|
|
|
(const :tag "(Face) SPACEs after TAB"
|
|
|
|
|
space-after-tab)
|
|
|
|
|
(const :tag "(Mark) SPACEs and HARD SPACEs"
|
|
|
|
|
space-mark)
|
|
|
|
|
(const :tag "(Mark) TABs" tab-mark)
|
|
|
|
|
(const :tag "(Mark) NEWLINEs" newline-mark)))
|
2008-01-31 16:08:29 +00:00
|
|
|
|
:group 'whitespace)
|
2008-01-17 12:46:55 +00:00
|
|
|
|
|
|
|
|
|
|
2008-01-31 16:08:29 +00:00
|
|
|
|
(defcustom whitespace-space 'whitespace-space
|
2008-12-03 05:48:14 +00:00
|
|
|
|
"Symbol face used to visualize SPACE.
|
2008-01-17 12:46:55 +00:00
|
|
|
|
|
2008-04-26 11:38:50 +00:00
|
|
|
|
Used when `whitespace-style' includes the value `spaces'."
|
2008-01-17 12:46:55 +00:00
|
|
|
|
:type 'face
|
2008-01-31 16:08:29 +00:00
|
|
|
|
:group 'whitespace)
|
2008-01-17 12:46:55 +00:00
|
|
|
|
|
|
|
|
|
|
2008-01-31 16:08:29 +00:00
|
|
|
|
(defface whitespace-space
|
2008-01-17 12:46:55 +00:00
|
|
|
|
'((((class color) (background dark))
|
Face cleanups. Remove some uses of old-style face spec and :bold/:italic.
* faces.el (set-face-attribute): Doc fix.
(modify-face): Don't use :bold and :italic.
(error, warning, success): Tweak definitions.
* cus-edit.el (custom-modified, custom-invalid, custom-rogue)
(custom-modified, custom-set, custom-changed, custom-themed)
(custom-saved, custom-button, custom-button-mouse)
(custom-button-pressed, custom-state, custom-comment-tag)
(custom-variable-tag, custom-group-tag-1, custom-group-tag)
(custom-group-subtitle): Use new-style face specs.
(custom-invalid-face, custom-rogue-face, custom-modified-face)
(custom-set-face, custom-changed-face, custom-saved-face)
(custom-button-face, custom-button-pressed-face)
(custom-documentation-face, custom-state-face)
(custom-comment-face, custom-comment-tag-face)
(custom-variable-tag-face, custom-variable-button-face)
(custom-face-tag-face, custom-group-tag-face-1)
(custom-group-tag-face): Remove obsolete face alias.
* epa.el (epa-validity-high, epa-validity-medium)
(epa-validity-low, epa-mark, epa-field-name, epa-string)
(epa-field-name, epa-field-body):
* font-lock.el (font-lock-comment-face, font-lock-string-face)
(font-lock-keyword-face, font-lock-builtin-face)
(font-lock-function-name-face, font-lock-variable-name-face)
(font-lock-type-face, font-lock-constant-face):
* ido.el (ido-first-match, ido-only-match, ido-subdir)
(ido-virtual, ido-indicator, ido-incomplete-regexp):
* speedbar.el (speedbar-button-face, speedbar-file-face)
(speedbar-directory-face, speedbar-tag-face)
(speedbar-selected-face, speedbar-highlight-face)
(speedbar-separator-face):
* whitespace.el (whitespace-newline, whitespace-space)
(whitespace-hspace, whitespace-tab, whitespace-trailing)
(whitespace-line, whitespace-space-before-tab)
(whitespace-space-after-tab, whitespace-indentation)
(whitespace-empty):
* emulation/cua-base.el (cua-global-mark):
* eshell/em-prompt.el (eshell-prompt):
* net/newst-plainview.el (newsticker-new-item-face)
(newsticker-old-item-face, newsticker-immortal-item-face)
(newsticker-obsolete-item-face, newsticker-date-face)
(newsticker-statistics-face, newsticker-default-face):
* net/newst-reader.el (newsticker-feed-face)
(newsticker-extra-face, newsticker-enclosure-face):
* net/newst-treeview.el (newsticker-treeview-face)
(newsticker-treeview-new-face, newsticker-treeview-old-face)
(newsticker-treeview-immortal-face)
(newsticker-treeview-obsolete-face)
(newsticker-treeview-selection-face):
* net/rcirc.el (rcirc-my-nick, rcirc-other-nick)
(rcirc-bright-nick, rcirc-server, rcirc-timestamp)
(rcirc-nick-in-message, rcirc-nick-in-message-full-line)
(rcirc-prompt, rcirc-track-keyword, rcirc-url, rcirc-keyword):
* nxml/nxml-outln.el (nxml-heading, nxml-outline-indicator)
(nxml-outline-active-indicator, nxml-outline-ellipsis):
* play/mpuz.el (mpuz-unsolved, mpuz-solved, mpuz-trivial)
(mpuz-text):
* progmodes/vera-mode.el (vera-font-lock-number)
(vera-font-lock-function, vera-font-lock-interface):
* textmodes/table.el (table-cell): Use new-style face specs, and
don't use the old :bold and :italic attributes.
* erc-button.el (erc-button):
* erc-goodies.el (erc-bold-face, erc-inverse-face)
(erc-underline-face, fg:erc-color-*):
* erc-match.el (erc-current-nick-face, erc-dangerous-host-face)
(erc-pal-face, erc-fool-face, erc-keyword-face):
* erc-stamp.el (erc-timestamp-face): Likewise.
* erc.el (erc-direct-msg-face, erc-header-line, erc-input-face)
(erc-command-indicator-face, erc-notice-face, erc-action-face)
(erc-error-face, erc-my-nick-face, erc-nick-default-face)
(erc-nick-msg-face): Use new-style face specs, and avoid :bold.
* progmodes/ebrowse.el (ebrowse-tree-mark, ebrowse-root-class)
(ebrowse-member-attribute, ebrowse-default, ebrowse-file-name)
(ebrowse-member-class, ebrowse-progress): Likewise.
(ebrowse-tree-mark-face, ebrowse-root-class-face)
(ebrowse-file-name-face, ebrowse-default-face)
(ebrowse-member-attribute-face, ebrowse-member-class-face)
(ebrowse-progress-face): Remove obsolete faces.
* progmodes/flymake.el (flymake-errline, flymake-warnline):
Inherit from error and warning faces respectively.
* textmodes/flyspell.el (flyspell-incorrect, flyspell-duplicate):
Likewise.
(flyspell-incorrect-face, flyspell-duplicate-face): Remove
obsolete aliases.
* display.texi (Face Attributes): Font family does not accept
wildcards. De-document obsolete :bold and :italic attributes.
(Defining Faces): Use new-style face spec format.
2012-06-08 16:39:49 +00:00
|
|
|
|
:background "grey20" :foreground "darkgray")
|
2008-01-17 12:46:55 +00:00
|
|
|
|
(((class color) (background light))
|
Face cleanups. Remove some uses of old-style face spec and :bold/:italic.
* faces.el (set-face-attribute): Doc fix.
(modify-face): Don't use :bold and :italic.
(error, warning, success): Tweak definitions.
* cus-edit.el (custom-modified, custom-invalid, custom-rogue)
(custom-modified, custom-set, custom-changed, custom-themed)
(custom-saved, custom-button, custom-button-mouse)
(custom-button-pressed, custom-state, custom-comment-tag)
(custom-variable-tag, custom-group-tag-1, custom-group-tag)
(custom-group-subtitle): Use new-style face specs.
(custom-invalid-face, custom-rogue-face, custom-modified-face)
(custom-set-face, custom-changed-face, custom-saved-face)
(custom-button-face, custom-button-pressed-face)
(custom-documentation-face, custom-state-face)
(custom-comment-face, custom-comment-tag-face)
(custom-variable-tag-face, custom-variable-button-face)
(custom-face-tag-face, custom-group-tag-face-1)
(custom-group-tag-face): Remove obsolete face alias.
* epa.el (epa-validity-high, epa-validity-medium)
(epa-validity-low, epa-mark, epa-field-name, epa-string)
(epa-field-name, epa-field-body):
* font-lock.el (font-lock-comment-face, font-lock-string-face)
(font-lock-keyword-face, font-lock-builtin-face)
(font-lock-function-name-face, font-lock-variable-name-face)
(font-lock-type-face, font-lock-constant-face):
* ido.el (ido-first-match, ido-only-match, ido-subdir)
(ido-virtual, ido-indicator, ido-incomplete-regexp):
* speedbar.el (speedbar-button-face, speedbar-file-face)
(speedbar-directory-face, speedbar-tag-face)
(speedbar-selected-face, speedbar-highlight-face)
(speedbar-separator-face):
* whitespace.el (whitespace-newline, whitespace-space)
(whitespace-hspace, whitespace-tab, whitespace-trailing)
(whitespace-line, whitespace-space-before-tab)
(whitespace-space-after-tab, whitespace-indentation)
(whitespace-empty):
* emulation/cua-base.el (cua-global-mark):
* eshell/em-prompt.el (eshell-prompt):
* net/newst-plainview.el (newsticker-new-item-face)
(newsticker-old-item-face, newsticker-immortal-item-face)
(newsticker-obsolete-item-face, newsticker-date-face)
(newsticker-statistics-face, newsticker-default-face):
* net/newst-reader.el (newsticker-feed-face)
(newsticker-extra-face, newsticker-enclosure-face):
* net/newst-treeview.el (newsticker-treeview-face)
(newsticker-treeview-new-face, newsticker-treeview-old-face)
(newsticker-treeview-immortal-face)
(newsticker-treeview-obsolete-face)
(newsticker-treeview-selection-face):
* net/rcirc.el (rcirc-my-nick, rcirc-other-nick)
(rcirc-bright-nick, rcirc-server, rcirc-timestamp)
(rcirc-nick-in-message, rcirc-nick-in-message-full-line)
(rcirc-prompt, rcirc-track-keyword, rcirc-url, rcirc-keyword):
* nxml/nxml-outln.el (nxml-heading, nxml-outline-indicator)
(nxml-outline-active-indicator, nxml-outline-ellipsis):
* play/mpuz.el (mpuz-unsolved, mpuz-solved, mpuz-trivial)
(mpuz-text):
* progmodes/vera-mode.el (vera-font-lock-number)
(vera-font-lock-function, vera-font-lock-interface):
* textmodes/table.el (table-cell): Use new-style face specs, and
don't use the old :bold and :italic attributes.
* erc-button.el (erc-button):
* erc-goodies.el (erc-bold-face, erc-inverse-face)
(erc-underline-face, fg:erc-color-*):
* erc-match.el (erc-current-nick-face, erc-dangerous-host-face)
(erc-pal-face, erc-fool-face, erc-keyword-face):
* erc-stamp.el (erc-timestamp-face): Likewise.
* erc.el (erc-direct-msg-face, erc-header-line, erc-input-face)
(erc-command-indicator-face, erc-notice-face, erc-action-face)
(erc-error-face, erc-my-nick-face, erc-nick-default-face)
(erc-nick-msg-face): Use new-style face specs, and avoid :bold.
* progmodes/ebrowse.el (ebrowse-tree-mark, ebrowse-root-class)
(ebrowse-member-attribute, ebrowse-default, ebrowse-file-name)
(ebrowse-member-class, ebrowse-progress): Likewise.
(ebrowse-tree-mark-face, ebrowse-root-class-face)
(ebrowse-file-name-face, ebrowse-default-face)
(ebrowse-member-attribute-face, ebrowse-member-class-face)
(ebrowse-progress-face): Remove obsolete faces.
* progmodes/flymake.el (flymake-errline, flymake-warnline):
Inherit from error and warning faces respectively.
* textmodes/flyspell.el (flyspell-incorrect, flyspell-duplicate):
Likewise.
(flyspell-incorrect-face, flyspell-duplicate-face): Remove
obsolete aliases.
* display.texi (Face Attributes): Font family does not accept
wildcards. De-document obsolete :bold and :italic attributes.
(Defining Faces): Use new-style face spec format.
2012-06-08 16:39:49 +00:00
|
|
|
|
:background "LightYellow" :foreground "lightgray")
|
|
|
|
|
(t :inverse-video t))
|
2008-01-21 12:45:58 +00:00
|
|
|
|
"Face used to visualize SPACE."
|
2008-01-31 16:08:29 +00:00
|
|
|
|
:group 'whitespace)
|
2008-01-17 12:46:55 +00:00
|
|
|
|
|
|
|
|
|
|
2008-01-31 16:08:29 +00:00
|
|
|
|
(defcustom whitespace-hspace 'whitespace-hspace
|
2008-12-03 05:48:14 +00:00
|
|
|
|
"Symbol face used to visualize HARD SPACE.
|
2008-01-17 12:46:55 +00:00
|
|
|
|
|
2008-04-26 11:38:50 +00:00
|
|
|
|
Used when `whitespace-style' includes the value `spaces'."
|
2008-01-17 12:46:55 +00:00
|
|
|
|
:type 'face
|
2008-01-31 16:08:29 +00:00
|
|
|
|
:group 'whitespace)
|
2008-01-17 12:46:55 +00:00
|
|
|
|
|
|
|
|
|
|
2008-01-31 16:08:29 +00:00
|
|
|
|
(defface whitespace-hspace ; 'nobreak-space
|
2008-01-17 12:46:55 +00:00
|
|
|
|
'((((class color) (background dark))
|
Face cleanups. Remove some uses of old-style face spec and :bold/:italic.
* faces.el (set-face-attribute): Doc fix.
(modify-face): Don't use :bold and :italic.
(error, warning, success): Tweak definitions.
* cus-edit.el (custom-modified, custom-invalid, custom-rogue)
(custom-modified, custom-set, custom-changed, custom-themed)
(custom-saved, custom-button, custom-button-mouse)
(custom-button-pressed, custom-state, custom-comment-tag)
(custom-variable-tag, custom-group-tag-1, custom-group-tag)
(custom-group-subtitle): Use new-style face specs.
(custom-invalid-face, custom-rogue-face, custom-modified-face)
(custom-set-face, custom-changed-face, custom-saved-face)
(custom-button-face, custom-button-pressed-face)
(custom-documentation-face, custom-state-face)
(custom-comment-face, custom-comment-tag-face)
(custom-variable-tag-face, custom-variable-button-face)
(custom-face-tag-face, custom-group-tag-face-1)
(custom-group-tag-face): Remove obsolete face alias.
* epa.el (epa-validity-high, epa-validity-medium)
(epa-validity-low, epa-mark, epa-field-name, epa-string)
(epa-field-name, epa-field-body):
* font-lock.el (font-lock-comment-face, font-lock-string-face)
(font-lock-keyword-face, font-lock-builtin-face)
(font-lock-function-name-face, font-lock-variable-name-face)
(font-lock-type-face, font-lock-constant-face):
* ido.el (ido-first-match, ido-only-match, ido-subdir)
(ido-virtual, ido-indicator, ido-incomplete-regexp):
* speedbar.el (speedbar-button-face, speedbar-file-face)
(speedbar-directory-face, speedbar-tag-face)
(speedbar-selected-face, speedbar-highlight-face)
(speedbar-separator-face):
* whitespace.el (whitespace-newline, whitespace-space)
(whitespace-hspace, whitespace-tab, whitespace-trailing)
(whitespace-line, whitespace-space-before-tab)
(whitespace-space-after-tab, whitespace-indentation)
(whitespace-empty):
* emulation/cua-base.el (cua-global-mark):
* eshell/em-prompt.el (eshell-prompt):
* net/newst-plainview.el (newsticker-new-item-face)
(newsticker-old-item-face, newsticker-immortal-item-face)
(newsticker-obsolete-item-face, newsticker-date-face)
(newsticker-statistics-face, newsticker-default-face):
* net/newst-reader.el (newsticker-feed-face)
(newsticker-extra-face, newsticker-enclosure-face):
* net/newst-treeview.el (newsticker-treeview-face)
(newsticker-treeview-new-face, newsticker-treeview-old-face)
(newsticker-treeview-immortal-face)
(newsticker-treeview-obsolete-face)
(newsticker-treeview-selection-face):
* net/rcirc.el (rcirc-my-nick, rcirc-other-nick)
(rcirc-bright-nick, rcirc-server, rcirc-timestamp)
(rcirc-nick-in-message, rcirc-nick-in-message-full-line)
(rcirc-prompt, rcirc-track-keyword, rcirc-url, rcirc-keyword):
* nxml/nxml-outln.el (nxml-heading, nxml-outline-indicator)
(nxml-outline-active-indicator, nxml-outline-ellipsis):
* play/mpuz.el (mpuz-unsolved, mpuz-solved, mpuz-trivial)
(mpuz-text):
* progmodes/vera-mode.el (vera-font-lock-number)
(vera-font-lock-function, vera-font-lock-interface):
* textmodes/table.el (table-cell): Use new-style face specs, and
don't use the old :bold and :italic attributes.
* erc-button.el (erc-button):
* erc-goodies.el (erc-bold-face, erc-inverse-face)
(erc-underline-face, fg:erc-color-*):
* erc-match.el (erc-current-nick-face, erc-dangerous-host-face)
(erc-pal-face, erc-fool-face, erc-keyword-face):
* erc-stamp.el (erc-timestamp-face): Likewise.
* erc.el (erc-direct-msg-face, erc-header-line, erc-input-face)
(erc-command-indicator-face, erc-notice-face, erc-action-face)
(erc-error-face, erc-my-nick-face, erc-nick-default-face)
(erc-nick-msg-face): Use new-style face specs, and avoid :bold.
* progmodes/ebrowse.el (ebrowse-tree-mark, ebrowse-root-class)
(ebrowse-member-attribute, ebrowse-default, ebrowse-file-name)
(ebrowse-member-class, ebrowse-progress): Likewise.
(ebrowse-tree-mark-face, ebrowse-root-class-face)
(ebrowse-file-name-face, ebrowse-default-face)
(ebrowse-member-attribute-face, ebrowse-member-class-face)
(ebrowse-progress-face): Remove obsolete faces.
* progmodes/flymake.el (flymake-errline, flymake-warnline):
Inherit from error and warning faces respectively.
* textmodes/flyspell.el (flyspell-incorrect, flyspell-duplicate):
Likewise.
(flyspell-incorrect-face, flyspell-duplicate-face): Remove
obsolete aliases.
* display.texi (Face Attributes): Font family does not accept
wildcards. De-document obsolete :bold and :italic attributes.
(Defining Faces): Use new-style face spec format.
2012-06-08 16:39:49 +00:00
|
|
|
|
:background "grey24" :foreground "darkgray")
|
2008-01-17 12:46:55 +00:00
|
|
|
|
(((class color) (background light))
|
Face cleanups. Remove some uses of old-style face spec and :bold/:italic.
* faces.el (set-face-attribute): Doc fix.
(modify-face): Don't use :bold and :italic.
(error, warning, success): Tweak definitions.
* cus-edit.el (custom-modified, custom-invalid, custom-rogue)
(custom-modified, custom-set, custom-changed, custom-themed)
(custom-saved, custom-button, custom-button-mouse)
(custom-button-pressed, custom-state, custom-comment-tag)
(custom-variable-tag, custom-group-tag-1, custom-group-tag)
(custom-group-subtitle): Use new-style face specs.
(custom-invalid-face, custom-rogue-face, custom-modified-face)
(custom-set-face, custom-changed-face, custom-saved-face)
(custom-button-face, custom-button-pressed-face)
(custom-documentation-face, custom-state-face)
(custom-comment-face, custom-comment-tag-face)
(custom-variable-tag-face, custom-variable-button-face)
(custom-face-tag-face, custom-group-tag-face-1)
(custom-group-tag-face): Remove obsolete face alias.
* epa.el (epa-validity-high, epa-validity-medium)
(epa-validity-low, epa-mark, epa-field-name, epa-string)
(epa-field-name, epa-field-body):
* font-lock.el (font-lock-comment-face, font-lock-string-face)
(font-lock-keyword-face, font-lock-builtin-face)
(font-lock-function-name-face, font-lock-variable-name-face)
(font-lock-type-face, font-lock-constant-face):
* ido.el (ido-first-match, ido-only-match, ido-subdir)
(ido-virtual, ido-indicator, ido-incomplete-regexp):
* speedbar.el (speedbar-button-face, speedbar-file-face)
(speedbar-directory-face, speedbar-tag-face)
(speedbar-selected-face, speedbar-highlight-face)
(speedbar-separator-face):
* whitespace.el (whitespace-newline, whitespace-space)
(whitespace-hspace, whitespace-tab, whitespace-trailing)
(whitespace-line, whitespace-space-before-tab)
(whitespace-space-after-tab, whitespace-indentation)
(whitespace-empty):
* emulation/cua-base.el (cua-global-mark):
* eshell/em-prompt.el (eshell-prompt):
* net/newst-plainview.el (newsticker-new-item-face)
(newsticker-old-item-face, newsticker-immortal-item-face)
(newsticker-obsolete-item-face, newsticker-date-face)
(newsticker-statistics-face, newsticker-default-face):
* net/newst-reader.el (newsticker-feed-face)
(newsticker-extra-face, newsticker-enclosure-face):
* net/newst-treeview.el (newsticker-treeview-face)
(newsticker-treeview-new-face, newsticker-treeview-old-face)
(newsticker-treeview-immortal-face)
(newsticker-treeview-obsolete-face)
(newsticker-treeview-selection-face):
* net/rcirc.el (rcirc-my-nick, rcirc-other-nick)
(rcirc-bright-nick, rcirc-server, rcirc-timestamp)
(rcirc-nick-in-message, rcirc-nick-in-message-full-line)
(rcirc-prompt, rcirc-track-keyword, rcirc-url, rcirc-keyword):
* nxml/nxml-outln.el (nxml-heading, nxml-outline-indicator)
(nxml-outline-active-indicator, nxml-outline-ellipsis):
* play/mpuz.el (mpuz-unsolved, mpuz-solved, mpuz-trivial)
(mpuz-text):
* progmodes/vera-mode.el (vera-font-lock-number)
(vera-font-lock-function, vera-font-lock-interface):
* textmodes/table.el (table-cell): Use new-style face specs, and
don't use the old :bold and :italic attributes.
* erc-button.el (erc-button):
* erc-goodies.el (erc-bold-face, erc-inverse-face)
(erc-underline-face, fg:erc-color-*):
* erc-match.el (erc-current-nick-face, erc-dangerous-host-face)
(erc-pal-face, erc-fool-face, erc-keyword-face):
* erc-stamp.el (erc-timestamp-face): Likewise.
* erc.el (erc-direct-msg-face, erc-header-line, erc-input-face)
(erc-command-indicator-face, erc-notice-face, erc-action-face)
(erc-error-face, erc-my-nick-face, erc-nick-default-face)
(erc-nick-msg-face): Use new-style face specs, and avoid :bold.
* progmodes/ebrowse.el (ebrowse-tree-mark, ebrowse-root-class)
(ebrowse-member-attribute, ebrowse-default, ebrowse-file-name)
(ebrowse-member-class, ebrowse-progress): Likewise.
(ebrowse-tree-mark-face, ebrowse-root-class-face)
(ebrowse-file-name-face, ebrowse-default-face)
(ebrowse-member-attribute-face, ebrowse-member-class-face)
(ebrowse-progress-face): Remove obsolete faces.
* progmodes/flymake.el (flymake-errline, flymake-warnline):
Inherit from error and warning faces respectively.
* textmodes/flyspell.el (flyspell-incorrect, flyspell-duplicate):
Likewise.
(flyspell-incorrect-face, flyspell-duplicate-face): Remove
obsolete aliases.
* display.texi (Face Attributes): Font family does not accept
wildcards. De-document obsolete :bold and :italic attributes.
(Defining Faces): Use new-style face spec format.
2012-06-08 16:39:49 +00:00
|
|
|
|
:background "LemonChiffon3" :foreground "lightgray")
|
|
|
|
|
(t :inverse-video t))
|
2008-01-21 12:45:58 +00:00
|
|
|
|
"Face used to visualize HARD SPACE."
|
2008-01-31 16:08:29 +00:00
|
|
|
|
:group 'whitespace)
|
2008-01-17 12:46:55 +00:00
|
|
|
|
|
|
|
|
|
|
2008-01-31 16:08:29 +00:00
|
|
|
|
(defcustom whitespace-tab 'whitespace-tab
|
2008-12-03 05:48:14 +00:00
|
|
|
|
"Symbol face used to visualize TAB.
|
2008-01-17 12:46:55 +00:00
|
|
|
|
|
2008-04-26 11:38:50 +00:00
|
|
|
|
Used when `whitespace-style' includes the value `tabs'."
|
2008-01-17 12:46:55 +00:00
|
|
|
|
:type 'face
|
2008-01-31 16:08:29 +00:00
|
|
|
|
:group 'whitespace)
|
2008-01-17 12:46:55 +00:00
|
|
|
|
|
|
|
|
|
|
2008-01-31 16:08:29 +00:00
|
|
|
|
(defface whitespace-tab
|
2008-01-17 12:46:55 +00:00
|
|
|
|
'((((class color) (background dark))
|
Face cleanups. Remove some uses of old-style face spec and :bold/:italic.
* faces.el (set-face-attribute): Doc fix.
(modify-face): Don't use :bold and :italic.
(error, warning, success): Tweak definitions.
* cus-edit.el (custom-modified, custom-invalid, custom-rogue)
(custom-modified, custom-set, custom-changed, custom-themed)
(custom-saved, custom-button, custom-button-mouse)
(custom-button-pressed, custom-state, custom-comment-tag)
(custom-variable-tag, custom-group-tag-1, custom-group-tag)
(custom-group-subtitle): Use new-style face specs.
(custom-invalid-face, custom-rogue-face, custom-modified-face)
(custom-set-face, custom-changed-face, custom-saved-face)
(custom-button-face, custom-button-pressed-face)
(custom-documentation-face, custom-state-face)
(custom-comment-face, custom-comment-tag-face)
(custom-variable-tag-face, custom-variable-button-face)
(custom-face-tag-face, custom-group-tag-face-1)
(custom-group-tag-face): Remove obsolete face alias.
* epa.el (epa-validity-high, epa-validity-medium)
(epa-validity-low, epa-mark, epa-field-name, epa-string)
(epa-field-name, epa-field-body):
* font-lock.el (font-lock-comment-face, font-lock-string-face)
(font-lock-keyword-face, font-lock-builtin-face)
(font-lock-function-name-face, font-lock-variable-name-face)
(font-lock-type-face, font-lock-constant-face):
* ido.el (ido-first-match, ido-only-match, ido-subdir)
(ido-virtual, ido-indicator, ido-incomplete-regexp):
* speedbar.el (speedbar-button-face, speedbar-file-face)
(speedbar-directory-face, speedbar-tag-face)
(speedbar-selected-face, speedbar-highlight-face)
(speedbar-separator-face):
* whitespace.el (whitespace-newline, whitespace-space)
(whitespace-hspace, whitespace-tab, whitespace-trailing)
(whitespace-line, whitespace-space-before-tab)
(whitespace-space-after-tab, whitespace-indentation)
(whitespace-empty):
* emulation/cua-base.el (cua-global-mark):
* eshell/em-prompt.el (eshell-prompt):
* net/newst-plainview.el (newsticker-new-item-face)
(newsticker-old-item-face, newsticker-immortal-item-face)
(newsticker-obsolete-item-face, newsticker-date-face)
(newsticker-statistics-face, newsticker-default-face):
* net/newst-reader.el (newsticker-feed-face)
(newsticker-extra-face, newsticker-enclosure-face):
* net/newst-treeview.el (newsticker-treeview-face)
(newsticker-treeview-new-face, newsticker-treeview-old-face)
(newsticker-treeview-immortal-face)
(newsticker-treeview-obsolete-face)
(newsticker-treeview-selection-face):
* net/rcirc.el (rcirc-my-nick, rcirc-other-nick)
(rcirc-bright-nick, rcirc-server, rcirc-timestamp)
(rcirc-nick-in-message, rcirc-nick-in-message-full-line)
(rcirc-prompt, rcirc-track-keyword, rcirc-url, rcirc-keyword):
* nxml/nxml-outln.el (nxml-heading, nxml-outline-indicator)
(nxml-outline-active-indicator, nxml-outline-ellipsis):
* play/mpuz.el (mpuz-unsolved, mpuz-solved, mpuz-trivial)
(mpuz-text):
* progmodes/vera-mode.el (vera-font-lock-number)
(vera-font-lock-function, vera-font-lock-interface):
* textmodes/table.el (table-cell): Use new-style face specs, and
don't use the old :bold and :italic attributes.
* erc-button.el (erc-button):
* erc-goodies.el (erc-bold-face, erc-inverse-face)
(erc-underline-face, fg:erc-color-*):
* erc-match.el (erc-current-nick-face, erc-dangerous-host-face)
(erc-pal-face, erc-fool-face, erc-keyword-face):
* erc-stamp.el (erc-timestamp-face): Likewise.
* erc.el (erc-direct-msg-face, erc-header-line, erc-input-face)
(erc-command-indicator-face, erc-notice-face, erc-action-face)
(erc-error-face, erc-my-nick-face, erc-nick-default-face)
(erc-nick-msg-face): Use new-style face specs, and avoid :bold.
* progmodes/ebrowse.el (ebrowse-tree-mark, ebrowse-root-class)
(ebrowse-member-attribute, ebrowse-default, ebrowse-file-name)
(ebrowse-member-class, ebrowse-progress): Likewise.
(ebrowse-tree-mark-face, ebrowse-root-class-face)
(ebrowse-file-name-face, ebrowse-default-face)
(ebrowse-member-attribute-face, ebrowse-member-class-face)
(ebrowse-progress-face): Remove obsolete faces.
* progmodes/flymake.el (flymake-errline, flymake-warnline):
Inherit from error and warning faces respectively.
* textmodes/flyspell.el (flyspell-incorrect, flyspell-duplicate):
Likewise.
(flyspell-incorrect-face, flyspell-duplicate-face): Remove
obsolete aliases.
* display.texi (Face Attributes): Font family does not accept
wildcards. De-document obsolete :bold and :italic attributes.
(Defining Faces): Use new-style face spec format.
2012-06-08 16:39:49 +00:00
|
|
|
|
:background "grey22" :foreground "darkgray")
|
2008-01-17 12:46:55 +00:00
|
|
|
|
(((class color) (background light))
|
Face cleanups. Remove some uses of old-style face spec and :bold/:italic.
* faces.el (set-face-attribute): Doc fix.
(modify-face): Don't use :bold and :italic.
(error, warning, success): Tweak definitions.
* cus-edit.el (custom-modified, custom-invalid, custom-rogue)
(custom-modified, custom-set, custom-changed, custom-themed)
(custom-saved, custom-button, custom-button-mouse)
(custom-button-pressed, custom-state, custom-comment-tag)
(custom-variable-tag, custom-group-tag-1, custom-group-tag)
(custom-group-subtitle): Use new-style face specs.
(custom-invalid-face, custom-rogue-face, custom-modified-face)
(custom-set-face, custom-changed-face, custom-saved-face)
(custom-button-face, custom-button-pressed-face)
(custom-documentation-face, custom-state-face)
(custom-comment-face, custom-comment-tag-face)
(custom-variable-tag-face, custom-variable-button-face)
(custom-face-tag-face, custom-group-tag-face-1)
(custom-group-tag-face): Remove obsolete face alias.
* epa.el (epa-validity-high, epa-validity-medium)
(epa-validity-low, epa-mark, epa-field-name, epa-string)
(epa-field-name, epa-field-body):
* font-lock.el (font-lock-comment-face, font-lock-string-face)
(font-lock-keyword-face, font-lock-builtin-face)
(font-lock-function-name-face, font-lock-variable-name-face)
(font-lock-type-face, font-lock-constant-face):
* ido.el (ido-first-match, ido-only-match, ido-subdir)
(ido-virtual, ido-indicator, ido-incomplete-regexp):
* speedbar.el (speedbar-button-face, speedbar-file-face)
(speedbar-directory-face, speedbar-tag-face)
(speedbar-selected-face, speedbar-highlight-face)
(speedbar-separator-face):
* whitespace.el (whitespace-newline, whitespace-space)
(whitespace-hspace, whitespace-tab, whitespace-trailing)
(whitespace-line, whitespace-space-before-tab)
(whitespace-space-after-tab, whitespace-indentation)
(whitespace-empty):
* emulation/cua-base.el (cua-global-mark):
* eshell/em-prompt.el (eshell-prompt):
* net/newst-plainview.el (newsticker-new-item-face)
(newsticker-old-item-face, newsticker-immortal-item-face)
(newsticker-obsolete-item-face, newsticker-date-face)
(newsticker-statistics-face, newsticker-default-face):
* net/newst-reader.el (newsticker-feed-face)
(newsticker-extra-face, newsticker-enclosure-face):
* net/newst-treeview.el (newsticker-treeview-face)
(newsticker-treeview-new-face, newsticker-treeview-old-face)
(newsticker-treeview-immortal-face)
(newsticker-treeview-obsolete-face)
(newsticker-treeview-selection-face):
* net/rcirc.el (rcirc-my-nick, rcirc-other-nick)
(rcirc-bright-nick, rcirc-server, rcirc-timestamp)
(rcirc-nick-in-message, rcirc-nick-in-message-full-line)
(rcirc-prompt, rcirc-track-keyword, rcirc-url, rcirc-keyword):
* nxml/nxml-outln.el (nxml-heading, nxml-outline-indicator)
(nxml-outline-active-indicator, nxml-outline-ellipsis):
* play/mpuz.el (mpuz-unsolved, mpuz-solved, mpuz-trivial)
(mpuz-text):
* progmodes/vera-mode.el (vera-font-lock-number)
(vera-font-lock-function, vera-font-lock-interface):
* textmodes/table.el (table-cell): Use new-style face specs, and
don't use the old :bold and :italic attributes.
* erc-button.el (erc-button):
* erc-goodies.el (erc-bold-face, erc-inverse-face)
(erc-underline-face, fg:erc-color-*):
* erc-match.el (erc-current-nick-face, erc-dangerous-host-face)
(erc-pal-face, erc-fool-face, erc-keyword-face):
* erc-stamp.el (erc-timestamp-face): Likewise.
* erc.el (erc-direct-msg-face, erc-header-line, erc-input-face)
(erc-command-indicator-face, erc-notice-face, erc-action-face)
(erc-error-face, erc-my-nick-face, erc-nick-default-face)
(erc-nick-msg-face): Use new-style face specs, and avoid :bold.
* progmodes/ebrowse.el (ebrowse-tree-mark, ebrowse-root-class)
(ebrowse-member-attribute, ebrowse-default, ebrowse-file-name)
(ebrowse-member-class, ebrowse-progress): Likewise.
(ebrowse-tree-mark-face, ebrowse-root-class-face)
(ebrowse-file-name-face, ebrowse-default-face)
(ebrowse-member-attribute-face, ebrowse-member-class-face)
(ebrowse-progress-face): Remove obsolete faces.
* progmodes/flymake.el (flymake-errline, flymake-warnline):
Inherit from error and warning faces respectively.
* textmodes/flyspell.el (flyspell-incorrect, flyspell-duplicate):
Likewise.
(flyspell-incorrect-face, flyspell-duplicate-face): Remove
obsolete aliases.
* display.texi (Face Attributes): Font family does not accept
wildcards. De-document obsolete :bold and :italic attributes.
(Defining Faces): Use new-style face spec format.
2012-06-08 16:39:49 +00:00
|
|
|
|
:background "beige" :foreground "lightgray")
|
|
|
|
|
(t :inverse-video t))
|
2008-01-21 12:45:58 +00:00
|
|
|
|
"Face used to visualize TAB."
|
2008-01-31 16:08:29 +00:00
|
|
|
|
:group 'whitespace)
|
2008-01-17 12:46:55 +00:00
|
|
|
|
|
|
|
|
|
|
2008-01-31 16:08:29 +00:00
|
|
|
|
(defcustom whitespace-newline 'whitespace-newline
|
2008-12-03 05:48:14 +00:00
|
|
|
|
"Symbol face used to visualize NEWLINE char mapping.
|
2008-01-17 12:46:55 +00:00
|
|
|
|
|
2008-01-31 16:08:29 +00:00
|
|
|
|
See `whitespace-display-mappings'.
|
2008-01-17 12:46:55 +00:00
|
|
|
|
|
2008-04-26 11:38:50 +00:00
|
|
|
|
Used when `whitespace-style' includes the values `newline-mark'
|
|
|
|
|
and `newline'."
|
2008-01-17 12:46:55 +00:00
|
|
|
|
:type 'face
|
2008-01-31 16:08:29 +00:00
|
|
|
|
:group 'whitespace)
|
2008-01-17 12:46:55 +00:00
|
|
|
|
|
|
|
|
|
|
2008-01-31 16:08:29 +00:00
|
|
|
|
(defface whitespace-newline
|
Face cleanups. Remove some uses of old-style face spec and :bold/:italic.
* faces.el (set-face-attribute): Doc fix.
(modify-face): Don't use :bold and :italic.
(error, warning, success): Tweak definitions.
* cus-edit.el (custom-modified, custom-invalid, custom-rogue)
(custom-modified, custom-set, custom-changed, custom-themed)
(custom-saved, custom-button, custom-button-mouse)
(custom-button-pressed, custom-state, custom-comment-tag)
(custom-variable-tag, custom-group-tag-1, custom-group-tag)
(custom-group-subtitle): Use new-style face specs.
(custom-invalid-face, custom-rogue-face, custom-modified-face)
(custom-set-face, custom-changed-face, custom-saved-face)
(custom-button-face, custom-button-pressed-face)
(custom-documentation-face, custom-state-face)
(custom-comment-face, custom-comment-tag-face)
(custom-variable-tag-face, custom-variable-button-face)
(custom-face-tag-face, custom-group-tag-face-1)
(custom-group-tag-face): Remove obsolete face alias.
* epa.el (epa-validity-high, epa-validity-medium)
(epa-validity-low, epa-mark, epa-field-name, epa-string)
(epa-field-name, epa-field-body):
* font-lock.el (font-lock-comment-face, font-lock-string-face)
(font-lock-keyword-face, font-lock-builtin-face)
(font-lock-function-name-face, font-lock-variable-name-face)
(font-lock-type-face, font-lock-constant-face):
* ido.el (ido-first-match, ido-only-match, ido-subdir)
(ido-virtual, ido-indicator, ido-incomplete-regexp):
* speedbar.el (speedbar-button-face, speedbar-file-face)
(speedbar-directory-face, speedbar-tag-face)
(speedbar-selected-face, speedbar-highlight-face)
(speedbar-separator-face):
* whitespace.el (whitespace-newline, whitespace-space)
(whitespace-hspace, whitespace-tab, whitespace-trailing)
(whitespace-line, whitespace-space-before-tab)
(whitespace-space-after-tab, whitespace-indentation)
(whitespace-empty):
* emulation/cua-base.el (cua-global-mark):
* eshell/em-prompt.el (eshell-prompt):
* net/newst-plainview.el (newsticker-new-item-face)
(newsticker-old-item-face, newsticker-immortal-item-face)
(newsticker-obsolete-item-face, newsticker-date-face)
(newsticker-statistics-face, newsticker-default-face):
* net/newst-reader.el (newsticker-feed-face)
(newsticker-extra-face, newsticker-enclosure-face):
* net/newst-treeview.el (newsticker-treeview-face)
(newsticker-treeview-new-face, newsticker-treeview-old-face)
(newsticker-treeview-immortal-face)
(newsticker-treeview-obsolete-face)
(newsticker-treeview-selection-face):
* net/rcirc.el (rcirc-my-nick, rcirc-other-nick)
(rcirc-bright-nick, rcirc-server, rcirc-timestamp)
(rcirc-nick-in-message, rcirc-nick-in-message-full-line)
(rcirc-prompt, rcirc-track-keyword, rcirc-url, rcirc-keyword):
* nxml/nxml-outln.el (nxml-heading, nxml-outline-indicator)
(nxml-outline-active-indicator, nxml-outline-ellipsis):
* play/mpuz.el (mpuz-unsolved, mpuz-solved, mpuz-trivial)
(mpuz-text):
* progmodes/vera-mode.el (vera-font-lock-number)
(vera-font-lock-function, vera-font-lock-interface):
* textmodes/table.el (table-cell): Use new-style face specs, and
don't use the old :bold and :italic attributes.
* erc-button.el (erc-button):
* erc-goodies.el (erc-bold-face, erc-inverse-face)
(erc-underline-face, fg:erc-color-*):
* erc-match.el (erc-current-nick-face, erc-dangerous-host-face)
(erc-pal-face, erc-fool-face, erc-keyword-face):
* erc-stamp.el (erc-timestamp-face): Likewise.
* erc.el (erc-direct-msg-face, erc-header-line, erc-input-face)
(erc-command-indicator-face, erc-notice-face, erc-action-face)
(erc-error-face, erc-my-nick-face, erc-nick-default-face)
(erc-nick-msg-face): Use new-style face specs, and avoid :bold.
* progmodes/ebrowse.el (ebrowse-tree-mark, ebrowse-root-class)
(ebrowse-member-attribute, ebrowse-default, ebrowse-file-name)
(ebrowse-member-class, ebrowse-progress): Likewise.
(ebrowse-tree-mark-face, ebrowse-root-class-face)
(ebrowse-file-name-face, ebrowse-default-face)
(ebrowse-member-attribute-face, ebrowse-member-class-face)
(ebrowse-progress-face): Remove obsolete faces.
* progmodes/flymake.el (flymake-errline, flymake-warnline):
Inherit from error and warning faces respectively.
* textmodes/flyspell.el (flyspell-incorrect, flyspell-duplicate):
Likewise.
(flyspell-incorrect-face, flyspell-duplicate-face): Remove
obsolete aliases.
* display.texi (Face Attributes): Font family does not accept
wildcards. De-document obsolete :bold and :italic attributes.
(Defining Faces): Use new-style face spec format.
2012-06-08 16:39:49 +00:00
|
|
|
|
'((default :weight normal)
|
|
|
|
|
(((class color) (background dark)) :foreground "darkgray")
|
|
|
|
|
(((class color) (min-colors 88) (background light)) :foreground "lightgray")
|
2011-11-26 08:50:48 +00:00
|
|
|
|
;; Displays with 16 colors use lightgray as background, so using a
|
|
|
|
|
;; lightgray foreground makes the newline mark invisible.
|
Face cleanups. Remove some uses of old-style face spec and :bold/:italic.
* faces.el (set-face-attribute): Doc fix.
(modify-face): Don't use :bold and :italic.
(error, warning, success): Tweak definitions.
* cus-edit.el (custom-modified, custom-invalid, custom-rogue)
(custom-modified, custom-set, custom-changed, custom-themed)
(custom-saved, custom-button, custom-button-mouse)
(custom-button-pressed, custom-state, custom-comment-tag)
(custom-variable-tag, custom-group-tag-1, custom-group-tag)
(custom-group-subtitle): Use new-style face specs.
(custom-invalid-face, custom-rogue-face, custom-modified-face)
(custom-set-face, custom-changed-face, custom-saved-face)
(custom-button-face, custom-button-pressed-face)
(custom-documentation-face, custom-state-face)
(custom-comment-face, custom-comment-tag-face)
(custom-variable-tag-face, custom-variable-button-face)
(custom-face-tag-face, custom-group-tag-face-1)
(custom-group-tag-face): Remove obsolete face alias.
* epa.el (epa-validity-high, epa-validity-medium)
(epa-validity-low, epa-mark, epa-field-name, epa-string)
(epa-field-name, epa-field-body):
* font-lock.el (font-lock-comment-face, font-lock-string-face)
(font-lock-keyword-face, font-lock-builtin-face)
(font-lock-function-name-face, font-lock-variable-name-face)
(font-lock-type-face, font-lock-constant-face):
* ido.el (ido-first-match, ido-only-match, ido-subdir)
(ido-virtual, ido-indicator, ido-incomplete-regexp):
* speedbar.el (speedbar-button-face, speedbar-file-face)
(speedbar-directory-face, speedbar-tag-face)
(speedbar-selected-face, speedbar-highlight-face)
(speedbar-separator-face):
* whitespace.el (whitespace-newline, whitespace-space)
(whitespace-hspace, whitespace-tab, whitespace-trailing)
(whitespace-line, whitespace-space-before-tab)
(whitespace-space-after-tab, whitespace-indentation)
(whitespace-empty):
* emulation/cua-base.el (cua-global-mark):
* eshell/em-prompt.el (eshell-prompt):
* net/newst-plainview.el (newsticker-new-item-face)
(newsticker-old-item-face, newsticker-immortal-item-face)
(newsticker-obsolete-item-face, newsticker-date-face)
(newsticker-statistics-face, newsticker-default-face):
* net/newst-reader.el (newsticker-feed-face)
(newsticker-extra-face, newsticker-enclosure-face):
* net/newst-treeview.el (newsticker-treeview-face)
(newsticker-treeview-new-face, newsticker-treeview-old-face)
(newsticker-treeview-immortal-face)
(newsticker-treeview-obsolete-face)
(newsticker-treeview-selection-face):
* net/rcirc.el (rcirc-my-nick, rcirc-other-nick)
(rcirc-bright-nick, rcirc-server, rcirc-timestamp)
(rcirc-nick-in-message, rcirc-nick-in-message-full-line)
(rcirc-prompt, rcirc-track-keyword, rcirc-url, rcirc-keyword):
* nxml/nxml-outln.el (nxml-heading, nxml-outline-indicator)
(nxml-outline-active-indicator, nxml-outline-ellipsis):
* play/mpuz.el (mpuz-unsolved, mpuz-solved, mpuz-trivial)
(mpuz-text):
* progmodes/vera-mode.el (vera-font-lock-number)
(vera-font-lock-function, vera-font-lock-interface):
* textmodes/table.el (table-cell): Use new-style face specs, and
don't use the old :bold and :italic attributes.
* erc-button.el (erc-button):
* erc-goodies.el (erc-bold-face, erc-inverse-face)
(erc-underline-face, fg:erc-color-*):
* erc-match.el (erc-current-nick-face, erc-dangerous-host-face)
(erc-pal-face, erc-fool-face, erc-keyword-face):
* erc-stamp.el (erc-timestamp-face): Likewise.
* erc.el (erc-direct-msg-face, erc-header-line, erc-input-face)
(erc-command-indicator-face, erc-notice-face, erc-action-face)
(erc-error-face, erc-my-nick-face, erc-nick-default-face)
(erc-nick-msg-face): Use new-style face specs, and avoid :bold.
* progmodes/ebrowse.el (ebrowse-tree-mark, ebrowse-root-class)
(ebrowse-member-attribute, ebrowse-default, ebrowse-file-name)
(ebrowse-member-class, ebrowse-progress): Likewise.
(ebrowse-tree-mark-face, ebrowse-root-class-face)
(ebrowse-file-name-face, ebrowse-default-face)
(ebrowse-member-attribute-face, ebrowse-member-class-face)
(ebrowse-progress-face): Remove obsolete faces.
* progmodes/flymake.el (flymake-errline, flymake-warnline):
Inherit from error and warning faces respectively.
* textmodes/flyspell.el (flyspell-incorrect, flyspell-duplicate):
Likewise.
(flyspell-incorrect-face, flyspell-duplicate-face): Remove
obsolete aliases.
* display.texi (Face Attributes): Font family does not accept
wildcards. De-document obsolete :bold and :italic attributes.
(Defining Faces): Use new-style face spec format.
2012-06-08 16:39:49 +00:00
|
|
|
|
(((class color) (background light)) :foreground "brown")
|
|
|
|
|
(t :underline t))
|
2008-01-21 12:45:58 +00:00
|
|
|
|
"Face used to visualize NEWLINE char mapping.
|
2008-01-17 12:46:55 +00:00
|
|
|
|
|
2008-01-31 16:08:29 +00:00
|
|
|
|
See `whitespace-display-mappings'."
|
|
|
|
|
:group 'whitespace)
|
2008-01-17 12:46:55 +00:00
|
|
|
|
|
|
|
|
|
|
2008-01-31 16:08:29 +00:00
|
|
|
|
(defcustom whitespace-trailing 'whitespace-trailing
|
2008-12-03 05:48:14 +00:00
|
|
|
|
"Symbol face used to visualize trailing blanks.
|
2008-01-17 12:46:55 +00:00
|
|
|
|
|
2008-04-26 11:38:50 +00:00
|
|
|
|
Used when `whitespace-style' includes the value `trailing'."
|
2008-01-17 12:46:55 +00:00
|
|
|
|
:type 'face
|
2008-01-31 16:08:29 +00:00
|
|
|
|
:group 'whitespace)
|
2008-01-17 12:46:55 +00:00
|
|
|
|
|
|
|
|
|
|
2008-01-31 16:08:29 +00:00
|
|
|
|
(defface whitespace-trailing ; 'trailing-whitespace
|
Face cleanups. Remove some uses of old-style face spec and :bold/:italic.
* faces.el (set-face-attribute): Doc fix.
(modify-face): Don't use :bold and :italic.
(error, warning, success): Tweak definitions.
* cus-edit.el (custom-modified, custom-invalid, custom-rogue)
(custom-modified, custom-set, custom-changed, custom-themed)
(custom-saved, custom-button, custom-button-mouse)
(custom-button-pressed, custom-state, custom-comment-tag)
(custom-variable-tag, custom-group-tag-1, custom-group-tag)
(custom-group-subtitle): Use new-style face specs.
(custom-invalid-face, custom-rogue-face, custom-modified-face)
(custom-set-face, custom-changed-face, custom-saved-face)
(custom-button-face, custom-button-pressed-face)
(custom-documentation-face, custom-state-face)
(custom-comment-face, custom-comment-tag-face)
(custom-variable-tag-face, custom-variable-button-face)
(custom-face-tag-face, custom-group-tag-face-1)
(custom-group-tag-face): Remove obsolete face alias.
* epa.el (epa-validity-high, epa-validity-medium)
(epa-validity-low, epa-mark, epa-field-name, epa-string)
(epa-field-name, epa-field-body):
* font-lock.el (font-lock-comment-face, font-lock-string-face)
(font-lock-keyword-face, font-lock-builtin-face)
(font-lock-function-name-face, font-lock-variable-name-face)
(font-lock-type-face, font-lock-constant-face):
* ido.el (ido-first-match, ido-only-match, ido-subdir)
(ido-virtual, ido-indicator, ido-incomplete-regexp):
* speedbar.el (speedbar-button-face, speedbar-file-face)
(speedbar-directory-face, speedbar-tag-face)
(speedbar-selected-face, speedbar-highlight-face)
(speedbar-separator-face):
* whitespace.el (whitespace-newline, whitespace-space)
(whitespace-hspace, whitespace-tab, whitespace-trailing)
(whitespace-line, whitespace-space-before-tab)
(whitespace-space-after-tab, whitespace-indentation)
(whitespace-empty):
* emulation/cua-base.el (cua-global-mark):
* eshell/em-prompt.el (eshell-prompt):
* net/newst-plainview.el (newsticker-new-item-face)
(newsticker-old-item-face, newsticker-immortal-item-face)
(newsticker-obsolete-item-face, newsticker-date-face)
(newsticker-statistics-face, newsticker-default-face):
* net/newst-reader.el (newsticker-feed-face)
(newsticker-extra-face, newsticker-enclosure-face):
* net/newst-treeview.el (newsticker-treeview-face)
(newsticker-treeview-new-face, newsticker-treeview-old-face)
(newsticker-treeview-immortal-face)
(newsticker-treeview-obsolete-face)
(newsticker-treeview-selection-face):
* net/rcirc.el (rcirc-my-nick, rcirc-other-nick)
(rcirc-bright-nick, rcirc-server, rcirc-timestamp)
(rcirc-nick-in-message, rcirc-nick-in-message-full-line)
(rcirc-prompt, rcirc-track-keyword, rcirc-url, rcirc-keyword):
* nxml/nxml-outln.el (nxml-heading, nxml-outline-indicator)
(nxml-outline-active-indicator, nxml-outline-ellipsis):
* play/mpuz.el (mpuz-unsolved, mpuz-solved, mpuz-trivial)
(mpuz-text):
* progmodes/vera-mode.el (vera-font-lock-number)
(vera-font-lock-function, vera-font-lock-interface):
* textmodes/table.el (table-cell): Use new-style face specs, and
don't use the old :bold and :italic attributes.
* erc-button.el (erc-button):
* erc-goodies.el (erc-bold-face, erc-inverse-face)
(erc-underline-face, fg:erc-color-*):
* erc-match.el (erc-current-nick-face, erc-dangerous-host-face)
(erc-pal-face, erc-fool-face, erc-keyword-face):
* erc-stamp.el (erc-timestamp-face): Likewise.
* erc.el (erc-direct-msg-face, erc-header-line, erc-input-face)
(erc-command-indicator-face, erc-notice-face, erc-action-face)
(erc-error-face, erc-my-nick-face, erc-nick-default-face)
(erc-nick-msg-face): Use new-style face specs, and avoid :bold.
* progmodes/ebrowse.el (ebrowse-tree-mark, ebrowse-root-class)
(ebrowse-member-attribute, ebrowse-default, ebrowse-file-name)
(ebrowse-member-class, ebrowse-progress): Likewise.
(ebrowse-tree-mark-face, ebrowse-root-class-face)
(ebrowse-file-name-face, ebrowse-default-face)
(ebrowse-member-attribute-face, ebrowse-member-class-face)
(ebrowse-progress-face): Remove obsolete faces.
* progmodes/flymake.el (flymake-errline, flymake-warnline):
Inherit from error and warning faces respectively.
* textmodes/flyspell.el (flyspell-incorrect, flyspell-duplicate):
Likewise.
(flyspell-incorrect-face, flyspell-duplicate-face): Remove
obsolete aliases.
* display.texi (Face Attributes): Font family does not accept
wildcards. De-document obsolete :bold and :italic attributes.
(Defining Faces): Use new-style face spec format.
2012-06-08 16:39:49 +00:00
|
|
|
|
'((default :weight bold)
|
|
|
|
|
(((class mono)) :inverse-video t :underline t)
|
|
|
|
|
(t :background "red1" :foreground "yellow"))
|
2008-01-21 12:45:58 +00:00
|
|
|
|
"Face used to visualize trailing blanks."
|
2008-01-31 16:08:29 +00:00
|
|
|
|
:group 'whitespace)
|
2008-01-17 12:46:55 +00:00
|
|
|
|
|
|
|
|
|
|
2008-01-31 16:08:29 +00:00
|
|
|
|
(defcustom whitespace-line 'whitespace-line
|
2008-12-03 05:48:14 +00:00
|
|
|
|
"Symbol face used to visualize \"long\" lines.
|
2008-01-17 12:46:55 +00:00
|
|
|
|
|
2008-01-31 16:08:29 +00:00
|
|
|
|
See `whitespace-line-column'.
|
2008-01-17 12:46:55 +00:00
|
|
|
|
|
2008-04-26 11:38:50 +00:00
|
|
|
|
Used when `whitespace-style' includes the value `line'."
|
2008-01-17 12:46:55 +00:00
|
|
|
|
:type 'face
|
2008-01-31 16:08:29 +00:00
|
|
|
|
:group 'whitespace)
|
2008-01-17 12:46:55 +00:00
|
|
|
|
|
|
|
|
|
|
2008-01-31 16:08:29 +00:00
|
|
|
|
(defface whitespace-line
|
Face cleanups. Remove some uses of old-style face spec and :bold/:italic.
* faces.el (set-face-attribute): Doc fix.
(modify-face): Don't use :bold and :italic.
(error, warning, success): Tweak definitions.
* cus-edit.el (custom-modified, custom-invalid, custom-rogue)
(custom-modified, custom-set, custom-changed, custom-themed)
(custom-saved, custom-button, custom-button-mouse)
(custom-button-pressed, custom-state, custom-comment-tag)
(custom-variable-tag, custom-group-tag-1, custom-group-tag)
(custom-group-subtitle): Use new-style face specs.
(custom-invalid-face, custom-rogue-face, custom-modified-face)
(custom-set-face, custom-changed-face, custom-saved-face)
(custom-button-face, custom-button-pressed-face)
(custom-documentation-face, custom-state-face)
(custom-comment-face, custom-comment-tag-face)
(custom-variable-tag-face, custom-variable-button-face)
(custom-face-tag-face, custom-group-tag-face-1)
(custom-group-tag-face): Remove obsolete face alias.
* epa.el (epa-validity-high, epa-validity-medium)
(epa-validity-low, epa-mark, epa-field-name, epa-string)
(epa-field-name, epa-field-body):
* font-lock.el (font-lock-comment-face, font-lock-string-face)
(font-lock-keyword-face, font-lock-builtin-face)
(font-lock-function-name-face, font-lock-variable-name-face)
(font-lock-type-face, font-lock-constant-face):
* ido.el (ido-first-match, ido-only-match, ido-subdir)
(ido-virtual, ido-indicator, ido-incomplete-regexp):
* speedbar.el (speedbar-button-face, speedbar-file-face)
(speedbar-directory-face, speedbar-tag-face)
(speedbar-selected-face, speedbar-highlight-face)
(speedbar-separator-face):
* whitespace.el (whitespace-newline, whitespace-space)
(whitespace-hspace, whitespace-tab, whitespace-trailing)
(whitespace-line, whitespace-space-before-tab)
(whitespace-space-after-tab, whitespace-indentation)
(whitespace-empty):
* emulation/cua-base.el (cua-global-mark):
* eshell/em-prompt.el (eshell-prompt):
* net/newst-plainview.el (newsticker-new-item-face)
(newsticker-old-item-face, newsticker-immortal-item-face)
(newsticker-obsolete-item-face, newsticker-date-face)
(newsticker-statistics-face, newsticker-default-face):
* net/newst-reader.el (newsticker-feed-face)
(newsticker-extra-face, newsticker-enclosure-face):
* net/newst-treeview.el (newsticker-treeview-face)
(newsticker-treeview-new-face, newsticker-treeview-old-face)
(newsticker-treeview-immortal-face)
(newsticker-treeview-obsolete-face)
(newsticker-treeview-selection-face):
* net/rcirc.el (rcirc-my-nick, rcirc-other-nick)
(rcirc-bright-nick, rcirc-server, rcirc-timestamp)
(rcirc-nick-in-message, rcirc-nick-in-message-full-line)
(rcirc-prompt, rcirc-track-keyword, rcirc-url, rcirc-keyword):
* nxml/nxml-outln.el (nxml-heading, nxml-outline-indicator)
(nxml-outline-active-indicator, nxml-outline-ellipsis):
* play/mpuz.el (mpuz-unsolved, mpuz-solved, mpuz-trivial)
(mpuz-text):
* progmodes/vera-mode.el (vera-font-lock-number)
(vera-font-lock-function, vera-font-lock-interface):
* textmodes/table.el (table-cell): Use new-style face specs, and
don't use the old :bold and :italic attributes.
* erc-button.el (erc-button):
* erc-goodies.el (erc-bold-face, erc-inverse-face)
(erc-underline-face, fg:erc-color-*):
* erc-match.el (erc-current-nick-face, erc-dangerous-host-face)
(erc-pal-face, erc-fool-face, erc-keyword-face):
* erc-stamp.el (erc-timestamp-face): Likewise.
* erc.el (erc-direct-msg-face, erc-header-line, erc-input-face)
(erc-command-indicator-face, erc-notice-face, erc-action-face)
(erc-error-face, erc-my-nick-face, erc-nick-default-face)
(erc-nick-msg-face): Use new-style face specs, and avoid :bold.
* progmodes/ebrowse.el (ebrowse-tree-mark, ebrowse-root-class)
(ebrowse-member-attribute, ebrowse-default, ebrowse-file-name)
(ebrowse-member-class, ebrowse-progress): Likewise.
(ebrowse-tree-mark-face, ebrowse-root-class-face)
(ebrowse-file-name-face, ebrowse-default-face)
(ebrowse-member-attribute-face, ebrowse-member-class-face)
(ebrowse-progress-face): Remove obsolete faces.
* progmodes/flymake.el (flymake-errline, flymake-warnline):
Inherit from error and warning faces respectively.
* textmodes/flyspell.el (flyspell-incorrect, flyspell-duplicate):
Likewise.
(flyspell-incorrect-face, flyspell-duplicate-face): Remove
obsolete aliases.
* display.texi (Face Attributes): Font family does not accept
wildcards. De-document obsolete :bold and :italic attributes.
(Defining Faces): Use new-style face spec format.
2012-06-08 16:39:49 +00:00
|
|
|
|
'((((class mono)) :inverse-video t :weight bold :underline t)
|
|
|
|
|
(t :background "gray20" :foreground "violet"))
|
2008-01-21 12:45:58 +00:00
|
|
|
|
"Face used to visualize \"long\" lines.
|
2008-01-17 12:46:55 +00:00
|
|
|
|
|
2008-01-31 16:08:29 +00:00
|
|
|
|
See `whitespace-line-column'."
|
|
|
|
|
:group 'whitespace)
|
2008-01-17 12:46:55 +00:00
|
|
|
|
|
|
|
|
|
|
2008-01-31 16:08:29 +00:00
|
|
|
|
(defcustom whitespace-space-before-tab 'whitespace-space-before-tab
|
2008-12-03 05:48:14 +00:00
|
|
|
|
"Symbol face used to visualize SPACEs before TAB.
|
2008-01-17 12:46:55 +00:00
|
|
|
|
|
2008-04-26 11:38:50 +00:00
|
|
|
|
Used when `whitespace-style' includes the value `space-before-tab'."
|
2008-01-17 12:46:55 +00:00
|
|
|
|
:type 'face
|
2008-01-31 16:08:29 +00:00
|
|
|
|
:group 'whitespace)
|
2008-01-17 12:46:55 +00:00
|
|
|
|
|
|
|
|
|
|
2008-01-31 16:08:29 +00:00
|
|
|
|
(defface whitespace-space-before-tab
|
Face cleanups. Remove some uses of old-style face spec and :bold/:italic.
* faces.el (set-face-attribute): Doc fix.
(modify-face): Don't use :bold and :italic.
(error, warning, success): Tweak definitions.
* cus-edit.el (custom-modified, custom-invalid, custom-rogue)
(custom-modified, custom-set, custom-changed, custom-themed)
(custom-saved, custom-button, custom-button-mouse)
(custom-button-pressed, custom-state, custom-comment-tag)
(custom-variable-tag, custom-group-tag-1, custom-group-tag)
(custom-group-subtitle): Use new-style face specs.
(custom-invalid-face, custom-rogue-face, custom-modified-face)
(custom-set-face, custom-changed-face, custom-saved-face)
(custom-button-face, custom-button-pressed-face)
(custom-documentation-face, custom-state-face)
(custom-comment-face, custom-comment-tag-face)
(custom-variable-tag-face, custom-variable-button-face)
(custom-face-tag-face, custom-group-tag-face-1)
(custom-group-tag-face): Remove obsolete face alias.
* epa.el (epa-validity-high, epa-validity-medium)
(epa-validity-low, epa-mark, epa-field-name, epa-string)
(epa-field-name, epa-field-body):
* font-lock.el (font-lock-comment-face, font-lock-string-face)
(font-lock-keyword-face, font-lock-builtin-face)
(font-lock-function-name-face, font-lock-variable-name-face)
(font-lock-type-face, font-lock-constant-face):
* ido.el (ido-first-match, ido-only-match, ido-subdir)
(ido-virtual, ido-indicator, ido-incomplete-regexp):
* speedbar.el (speedbar-button-face, speedbar-file-face)
(speedbar-directory-face, speedbar-tag-face)
(speedbar-selected-face, speedbar-highlight-face)
(speedbar-separator-face):
* whitespace.el (whitespace-newline, whitespace-space)
(whitespace-hspace, whitespace-tab, whitespace-trailing)
(whitespace-line, whitespace-space-before-tab)
(whitespace-space-after-tab, whitespace-indentation)
(whitespace-empty):
* emulation/cua-base.el (cua-global-mark):
* eshell/em-prompt.el (eshell-prompt):
* net/newst-plainview.el (newsticker-new-item-face)
(newsticker-old-item-face, newsticker-immortal-item-face)
(newsticker-obsolete-item-face, newsticker-date-face)
(newsticker-statistics-face, newsticker-default-face):
* net/newst-reader.el (newsticker-feed-face)
(newsticker-extra-face, newsticker-enclosure-face):
* net/newst-treeview.el (newsticker-treeview-face)
(newsticker-treeview-new-face, newsticker-treeview-old-face)
(newsticker-treeview-immortal-face)
(newsticker-treeview-obsolete-face)
(newsticker-treeview-selection-face):
* net/rcirc.el (rcirc-my-nick, rcirc-other-nick)
(rcirc-bright-nick, rcirc-server, rcirc-timestamp)
(rcirc-nick-in-message, rcirc-nick-in-message-full-line)
(rcirc-prompt, rcirc-track-keyword, rcirc-url, rcirc-keyword):
* nxml/nxml-outln.el (nxml-heading, nxml-outline-indicator)
(nxml-outline-active-indicator, nxml-outline-ellipsis):
* play/mpuz.el (mpuz-unsolved, mpuz-solved, mpuz-trivial)
(mpuz-text):
* progmodes/vera-mode.el (vera-font-lock-number)
(vera-font-lock-function, vera-font-lock-interface):
* textmodes/table.el (table-cell): Use new-style face specs, and
don't use the old :bold and :italic attributes.
* erc-button.el (erc-button):
* erc-goodies.el (erc-bold-face, erc-inverse-face)
(erc-underline-face, fg:erc-color-*):
* erc-match.el (erc-current-nick-face, erc-dangerous-host-face)
(erc-pal-face, erc-fool-face, erc-keyword-face):
* erc-stamp.el (erc-timestamp-face): Likewise.
* erc.el (erc-direct-msg-face, erc-header-line, erc-input-face)
(erc-command-indicator-face, erc-notice-face, erc-action-face)
(erc-error-face, erc-my-nick-face, erc-nick-default-face)
(erc-nick-msg-face): Use new-style face specs, and avoid :bold.
* progmodes/ebrowse.el (ebrowse-tree-mark, ebrowse-root-class)
(ebrowse-member-attribute, ebrowse-default, ebrowse-file-name)
(ebrowse-member-class, ebrowse-progress): Likewise.
(ebrowse-tree-mark-face, ebrowse-root-class-face)
(ebrowse-file-name-face, ebrowse-default-face)
(ebrowse-member-attribute-face, ebrowse-member-class-face)
(ebrowse-progress-face): Remove obsolete faces.
* progmodes/flymake.el (flymake-errline, flymake-warnline):
Inherit from error and warning faces respectively.
* textmodes/flyspell.el (flyspell-incorrect, flyspell-duplicate):
Likewise.
(flyspell-incorrect-face, flyspell-duplicate-face): Remove
obsolete aliases.
* display.texi (Face Attributes): Font family does not accept
wildcards. De-document obsolete :bold and :italic attributes.
(Defining Faces): Use new-style face spec format.
2012-06-08 16:39:49 +00:00
|
|
|
|
'((((class mono)) :inverse-video t :weight bold :underline t)
|
|
|
|
|
(t :background "DarkOrange" :foreground "firebrick"))
|
2008-01-21 12:45:58 +00:00
|
|
|
|
"Face used to visualize SPACEs before TAB."
|
2008-01-31 16:08:29 +00:00
|
|
|
|
:group 'whitespace)
|
2008-01-17 12:46:55 +00:00
|
|
|
|
|
|
|
|
|
|
2008-01-31 16:08:29 +00:00
|
|
|
|
(defcustom whitespace-indentation 'whitespace-indentation
|
2008-12-03 05:48:14 +00:00
|
|
|
|
"Symbol face used to visualize 8 or more SPACEs at beginning of line.
|
2008-01-25 14:09:57 +00:00
|
|
|
|
|
2008-04-26 11:38:50 +00:00
|
|
|
|
Used when `whitespace-style' includes the value `indentation'."
|
2008-01-25 14:09:57 +00:00
|
|
|
|
:type 'face
|
2008-01-31 16:08:29 +00:00
|
|
|
|
:group 'whitespace)
|
2008-01-25 14:09:57 +00:00
|
|
|
|
|
|
|
|
|
|
2008-01-31 16:08:29 +00:00
|
|
|
|
(defface whitespace-indentation
|
Face cleanups. Remove some uses of old-style face spec and :bold/:italic.
* faces.el (set-face-attribute): Doc fix.
(modify-face): Don't use :bold and :italic.
(error, warning, success): Tweak definitions.
* cus-edit.el (custom-modified, custom-invalid, custom-rogue)
(custom-modified, custom-set, custom-changed, custom-themed)
(custom-saved, custom-button, custom-button-mouse)
(custom-button-pressed, custom-state, custom-comment-tag)
(custom-variable-tag, custom-group-tag-1, custom-group-tag)
(custom-group-subtitle): Use new-style face specs.
(custom-invalid-face, custom-rogue-face, custom-modified-face)
(custom-set-face, custom-changed-face, custom-saved-face)
(custom-button-face, custom-button-pressed-face)
(custom-documentation-face, custom-state-face)
(custom-comment-face, custom-comment-tag-face)
(custom-variable-tag-face, custom-variable-button-face)
(custom-face-tag-face, custom-group-tag-face-1)
(custom-group-tag-face): Remove obsolete face alias.
* epa.el (epa-validity-high, epa-validity-medium)
(epa-validity-low, epa-mark, epa-field-name, epa-string)
(epa-field-name, epa-field-body):
* font-lock.el (font-lock-comment-face, font-lock-string-face)
(font-lock-keyword-face, font-lock-builtin-face)
(font-lock-function-name-face, font-lock-variable-name-face)
(font-lock-type-face, font-lock-constant-face):
* ido.el (ido-first-match, ido-only-match, ido-subdir)
(ido-virtual, ido-indicator, ido-incomplete-regexp):
* speedbar.el (speedbar-button-face, speedbar-file-face)
(speedbar-directory-face, speedbar-tag-face)
(speedbar-selected-face, speedbar-highlight-face)
(speedbar-separator-face):
* whitespace.el (whitespace-newline, whitespace-space)
(whitespace-hspace, whitespace-tab, whitespace-trailing)
(whitespace-line, whitespace-space-before-tab)
(whitespace-space-after-tab, whitespace-indentation)
(whitespace-empty):
* emulation/cua-base.el (cua-global-mark):
* eshell/em-prompt.el (eshell-prompt):
* net/newst-plainview.el (newsticker-new-item-face)
(newsticker-old-item-face, newsticker-immortal-item-face)
(newsticker-obsolete-item-face, newsticker-date-face)
(newsticker-statistics-face, newsticker-default-face):
* net/newst-reader.el (newsticker-feed-face)
(newsticker-extra-face, newsticker-enclosure-face):
* net/newst-treeview.el (newsticker-treeview-face)
(newsticker-treeview-new-face, newsticker-treeview-old-face)
(newsticker-treeview-immortal-face)
(newsticker-treeview-obsolete-face)
(newsticker-treeview-selection-face):
* net/rcirc.el (rcirc-my-nick, rcirc-other-nick)
(rcirc-bright-nick, rcirc-server, rcirc-timestamp)
(rcirc-nick-in-message, rcirc-nick-in-message-full-line)
(rcirc-prompt, rcirc-track-keyword, rcirc-url, rcirc-keyword):
* nxml/nxml-outln.el (nxml-heading, nxml-outline-indicator)
(nxml-outline-active-indicator, nxml-outline-ellipsis):
* play/mpuz.el (mpuz-unsolved, mpuz-solved, mpuz-trivial)
(mpuz-text):
* progmodes/vera-mode.el (vera-font-lock-number)
(vera-font-lock-function, vera-font-lock-interface):
* textmodes/table.el (table-cell): Use new-style face specs, and
don't use the old :bold and :italic attributes.
* erc-button.el (erc-button):
* erc-goodies.el (erc-bold-face, erc-inverse-face)
(erc-underline-face, fg:erc-color-*):
* erc-match.el (erc-current-nick-face, erc-dangerous-host-face)
(erc-pal-face, erc-fool-face, erc-keyword-face):
* erc-stamp.el (erc-timestamp-face): Likewise.
* erc.el (erc-direct-msg-face, erc-header-line, erc-input-face)
(erc-command-indicator-face, erc-notice-face, erc-action-face)
(erc-error-face, erc-my-nick-face, erc-nick-default-face)
(erc-nick-msg-face): Use new-style face specs, and avoid :bold.
* progmodes/ebrowse.el (ebrowse-tree-mark, ebrowse-root-class)
(ebrowse-member-attribute, ebrowse-default, ebrowse-file-name)
(ebrowse-member-class, ebrowse-progress): Likewise.
(ebrowse-tree-mark-face, ebrowse-root-class-face)
(ebrowse-file-name-face, ebrowse-default-face)
(ebrowse-member-attribute-face, ebrowse-member-class-face)
(ebrowse-progress-face): Remove obsolete faces.
* progmodes/flymake.el (flymake-errline, flymake-warnline):
Inherit from error and warning faces respectively.
* textmodes/flyspell.el (flyspell-incorrect, flyspell-duplicate):
Likewise.
(flyspell-incorrect-face, flyspell-duplicate-face): Remove
obsolete aliases.
* display.texi (Face Attributes): Font family does not accept
wildcards. De-document obsolete :bold and :italic attributes.
(Defining Faces): Use new-style face spec format.
2012-06-08 16:39:49 +00:00
|
|
|
|
'((((class mono)) :inverse-video t :weight bold :underline t)
|
|
|
|
|
(t :background "yellow" :foreground "firebrick"))
|
2008-01-25 14:09:57 +00:00
|
|
|
|
"Face used to visualize 8 or more SPACEs at beginning of line."
|
2008-01-31 16:08:29 +00:00
|
|
|
|
:group 'whitespace)
|
2008-01-25 14:09:57 +00:00
|
|
|
|
|
|
|
|
|
|
2008-01-31 16:08:29 +00:00
|
|
|
|
(defcustom whitespace-empty 'whitespace-empty
|
2008-12-03 05:48:14 +00:00
|
|
|
|
"Symbol face used to visualize empty lines at beginning and/or end of buffer.
|
2008-01-25 14:09:57 +00:00
|
|
|
|
|
2008-04-26 11:38:50 +00:00
|
|
|
|
Used when `whitespace-style' includes the value `empty'."
|
2008-01-25 14:09:57 +00:00
|
|
|
|
:type 'face
|
2008-01-31 16:08:29 +00:00
|
|
|
|
:group 'whitespace)
|
2008-01-25 14:09:57 +00:00
|
|
|
|
|
|
|
|
|
|
2008-01-31 16:08:29 +00:00
|
|
|
|
(defface whitespace-empty
|
Face cleanups. Remove some uses of old-style face spec and :bold/:italic.
* faces.el (set-face-attribute): Doc fix.
(modify-face): Don't use :bold and :italic.
(error, warning, success): Tweak definitions.
* cus-edit.el (custom-modified, custom-invalid, custom-rogue)
(custom-modified, custom-set, custom-changed, custom-themed)
(custom-saved, custom-button, custom-button-mouse)
(custom-button-pressed, custom-state, custom-comment-tag)
(custom-variable-tag, custom-group-tag-1, custom-group-tag)
(custom-group-subtitle): Use new-style face specs.
(custom-invalid-face, custom-rogue-face, custom-modified-face)
(custom-set-face, custom-changed-face, custom-saved-face)
(custom-button-face, custom-button-pressed-face)
(custom-documentation-face, custom-state-face)
(custom-comment-face, custom-comment-tag-face)
(custom-variable-tag-face, custom-variable-button-face)
(custom-face-tag-face, custom-group-tag-face-1)
(custom-group-tag-face): Remove obsolete face alias.
* epa.el (epa-validity-high, epa-validity-medium)
(epa-validity-low, epa-mark, epa-field-name, epa-string)
(epa-field-name, epa-field-body):
* font-lock.el (font-lock-comment-face, font-lock-string-face)
(font-lock-keyword-face, font-lock-builtin-face)
(font-lock-function-name-face, font-lock-variable-name-face)
(font-lock-type-face, font-lock-constant-face):
* ido.el (ido-first-match, ido-only-match, ido-subdir)
(ido-virtual, ido-indicator, ido-incomplete-regexp):
* speedbar.el (speedbar-button-face, speedbar-file-face)
(speedbar-directory-face, speedbar-tag-face)
(speedbar-selected-face, speedbar-highlight-face)
(speedbar-separator-face):
* whitespace.el (whitespace-newline, whitespace-space)
(whitespace-hspace, whitespace-tab, whitespace-trailing)
(whitespace-line, whitespace-space-before-tab)
(whitespace-space-after-tab, whitespace-indentation)
(whitespace-empty):
* emulation/cua-base.el (cua-global-mark):
* eshell/em-prompt.el (eshell-prompt):
* net/newst-plainview.el (newsticker-new-item-face)
(newsticker-old-item-face, newsticker-immortal-item-face)
(newsticker-obsolete-item-face, newsticker-date-face)
(newsticker-statistics-face, newsticker-default-face):
* net/newst-reader.el (newsticker-feed-face)
(newsticker-extra-face, newsticker-enclosure-face):
* net/newst-treeview.el (newsticker-treeview-face)
(newsticker-treeview-new-face, newsticker-treeview-old-face)
(newsticker-treeview-immortal-face)
(newsticker-treeview-obsolete-face)
(newsticker-treeview-selection-face):
* net/rcirc.el (rcirc-my-nick, rcirc-other-nick)
(rcirc-bright-nick, rcirc-server, rcirc-timestamp)
(rcirc-nick-in-message, rcirc-nick-in-message-full-line)
(rcirc-prompt, rcirc-track-keyword, rcirc-url, rcirc-keyword):
* nxml/nxml-outln.el (nxml-heading, nxml-outline-indicator)
(nxml-outline-active-indicator, nxml-outline-ellipsis):
* play/mpuz.el (mpuz-unsolved, mpuz-solved, mpuz-trivial)
(mpuz-text):
* progmodes/vera-mode.el (vera-font-lock-number)
(vera-font-lock-function, vera-font-lock-interface):
* textmodes/table.el (table-cell): Use new-style face specs, and
don't use the old :bold and :italic attributes.
* erc-button.el (erc-button):
* erc-goodies.el (erc-bold-face, erc-inverse-face)
(erc-underline-face, fg:erc-color-*):
* erc-match.el (erc-current-nick-face, erc-dangerous-host-face)
(erc-pal-face, erc-fool-face, erc-keyword-face):
* erc-stamp.el (erc-timestamp-face): Likewise.
* erc.el (erc-direct-msg-face, erc-header-line, erc-input-face)
(erc-command-indicator-face, erc-notice-face, erc-action-face)
(erc-error-face, erc-my-nick-face, erc-nick-default-face)
(erc-nick-msg-face): Use new-style face specs, and avoid :bold.
* progmodes/ebrowse.el (ebrowse-tree-mark, ebrowse-root-class)
(ebrowse-member-attribute, ebrowse-default, ebrowse-file-name)
(ebrowse-member-class, ebrowse-progress): Likewise.
(ebrowse-tree-mark-face, ebrowse-root-class-face)
(ebrowse-file-name-face, ebrowse-default-face)
(ebrowse-member-attribute-face, ebrowse-member-class-face)
(ebrowse-progress-face): Remove obsolete faces.
* progmodes/flymake.el (flymake-errline, flymake-warnline):
Inherit from error and warning faces respectively.
* textmodes/flyspell.el (flyspell-incorrect, flyspell-duplicate):
Likewise.
(flyspell-incorrect-face, flyspell-duplicate-face): Remove
obsolete aliases.
* display.texi (Face Attributes): Font family does not accept
wildcards. De-document obsolete :bold and :italic attributes.
(Defining Faces): Use new-style face spec format.
2012-06-08 16:39:49 +00:00
|
|
|
|
'((((class mono)) :inverse-video t :weight bold :underline t)
|
|
|
|
|
(t :background "yellow" :foreground "firebrick"))
|
2008-01-25 14:09:57 +00:00
|
|
|
|
"Face used to visualize empty lines at beginning and/or end of buffer."
|
2008-01-31 16:08:29 +00:00
|
|
|
|
:group 'whitespace)
|
2008-01-25 14:09:57 +00:00
|
|
|
|
|
|
|
|
|
|
2008-01-31 16:08:29 +00:00
|
|
|
|
(defcustom whitespace-space-after-tab 'whitespace-space-after-tab
|
2008-12-03 05:48:14 +00:00
|
|
|
|
"Symbol face used to visualize 8 or more SPACEs after TAB.
|
2008-01-25 14:09:57 +00:00
|
|
|
|
|
2008-04-26 11:38:50 +00:00
|
|
|
|
Used when `whitespace-style' includes the value `space-after-tab'."
|
2008-01-25 14:09:57 +00:00
|
|
|
|
:type 'face
|
2008-01-31 16:08:29 +00:00
|
|
|
|
:group 'whitespace)
|
2008-01-25 14:09:57 +00:00
|
|
|
|
|
|
|
|
|
|
2008-01-31 16:08:29 +00:00
|
|
|
|
(defface whitespace-space-after-tab
|
Face cleanups. Remove some uses of old-style face spec and :bold/:italic.
* faces.el (set-face-attribute): Doc fix.
(modify-face): Don't use :bold and :italic.
(error, warning, success): Tweak definitions.
* cus-edit.el (custom-modified, custom-invalid, custom-rogue)
(custom-modified, custom-set, custom-changed, custom-themed)
(custom-saved, custom-button, custom-button-mouse)
(custom-button-pressed, custom-state, custom-comment-tag)
(custom-variable-tag, custom-group-tag-1, custom-group-tag)
(custom-group-subtitle): Use new-style face specs.
(custom-invalid-face, custom-rogue-face, custom-modified-face)
(custom-set-face, custom-changed-face, custom-saved-face)
(custom-button-face, custom-button-pressed-face)
(custom-documentation-face, custom-state-face)
(custom-comment-face, custom-comment-tag-face)
(custom-variable-tag-face, custom-variable-button-face)
(custom-face-tag-face, custom-group-tag-face-1)
(custom-group-tag-face): Remove obsolete face alias.
* epa.el (epa-validity-high, epa-validity-medium)
(epa-validity-low, epa-mark, epa-field-name, epa-string)
(epa-field-name, epa-field-body):
* font-lock.el (font-lock-comment-face, font-lock-string-face)
(font-lock-keyword-face, font-lock-builtin-face)
(font-lock-function-name-face, font-lock-variable-name-face)
(font-lock-type-face, font-lock-constant-face):
* ido.el (ido-first-match, ido-only-match, ido-subdir)
(ido-virtual, ido-indicator, ido-incomplete-regexp):
* speedbar.el (speedbar-button-face, speedbar-file-face)
(speedbar-directory-face, speedbar-tag-face)
(speedbar-selected-face, speedbar-highlight-face)
(speedbar-separator-face):
* whitespace.el (whitespace-newline, whitespace-space)
(whitespace-hspace, whitespace-tab, whitespace-trailing)
(whitespace-line, whitespace-space-before-tab)
(whitespace-space-after-tab, whitespace-indentation)
(whitespace-empty):
* emulation/cua-base.el (cua-global-mark):
* eshell/em-prompt.el (eshell-prompt):
* net/newst-plainview.el (newsticker-new-item-face)
(newsticker-old-item-face, newsticker-immortal-item-face)
(newsticker-obsolete-item-face, newsticker-date-face)
(newsticker-statistics-face, newsticker-default-face):
* net/newst-reader.el (newsticker-feed-face)
(newsticker-extra-face, newsticker-enclosure-face):
* net/newst-treeview.el (newsticker-treeview-face)
(newsticker-treeview-new-face, newsticker-treeview-old-face)
(newsticker-treeview-immortal-face)
(newsticker-treeview-obsolete-face)
(newsticker-treeview-selection-face):
* net/rcirc.el (rcirc-my-nick, rcirc-other-nick)
(rcirc-bright-nick, rcirc-server, rcirc-timestamp)
(rcirc-nick-in-message, rcirc-nick-in-message-full-line)
(rcirc-prompt, rcirc-track-keyword, rcirc-url, rcirc-keyword):
* nxml/nxml-outln.el (nxml-heading, nxml-outline-indicator)
(nxml-outline-active-indicator, nxml-outline-ellipsis):
* play/mpuz.el (mpuz-unsolved, mpuz-solved, mpuz-trivial)
(mpuz-text):
* progmodes/vera-mode.el (vera-font-lock-number)
(vera-font-lock-function, vera-font-lock-interface):
* textmodes/table.el (table-cell): Use new-style face specs, and
don't use the old :bold and :italic attributes.
* erc-button.el (erc-button):
* erc-goodies.el (erc-bold-face, erc-inverse-face)
(erc-underline-face, fg:erc-color-*):
* erc-match.el (erc-current-nick-face, erc-dangerous-host-face)
(erc-pal-face, erc-fool-face, erc-keyword-face):
* erc-stamp.el (erc-timestamp-face): Likewise.
* erc.el (erc-direct-msg-face, erc-header-line, erc-input-face)
(erc-command-indicator-face, erc-notice-face, erc-action-face)
(erc-error-face, erc-my-nick-face, erc-nick-default-face)
(erc-nick-msg-face): Use new-style face specs, and avoid :bold.
* progmodes/ebrowse.el (ebrowse-tree-mark, ebrowse-root-class)
(ebrowse-member-attribute, ebrowse-default, ebrowse-file-name)
(ebrowse-member-class, ebrowse-progress): Likewise.
(ebrowse-tree-mark-face, ebrowse-root-class-face)
(ebrowse-file-name-face, ebrowse-default-face)
(ebrowse-member-attribute-face, ebrowse-member-class-face)
(ebrowse-progress-face): Remove obsolete faces.
* progmodes/flymake.el (flymake-errline, flymake-warnline):
Inherit from error and warning faces respectively.
* textmodes/flyspell.el (flyspell-incorrect, flyspell-duplicate):
Likewise.
(flyspell-incorrect-face, flyspell-duplicate-face): Remove
obsolete aliases.
* display.texi (Face Attributes): Font family does not accept
wildcards. De-document obsolete :bold and :italic attributes.
(Defining Faces): Use new-style face spec format.
2012-06-08 16:39:49 +00:00
|
|
|
|
'((((class mono)) :inverse-video t :weight bold :underline t)
|
|
|
|
|
(t :background "yellow" :foreground "firebrick"))
|
2008-01-25 14:09:57 +00:00
|
|
|
|
"Face used to visualize 8 or more SPACEs after TAB."
|
2008-01-31 16:08:29 +00:00
|
|
|
|
:group 'whitespace)
|
2008-01-25 14:09:57 +00:00
|
|
|
|
|
|
|
|
|
|
2008-01-31 16:08:29 +00:00
|
|
|
|
(defcustom whitespace-hspace-regexp
|
2008-01-17 12:46:55 +00:00
|
|
|
|
"\\(\\(\xA0\\|\x8A0\\|\x920\\|\xE20\\|\xF20\\)+\\)"
|
2008-12-03 05:48:14 +00:00
|
|
|
|
"Specify HARD SPACE characters regexp.
|
2008-01-17 12:46:55 +00:00
|
|
|
|
|
(whitespace): Set :version tag to 23.1.
(whitespace-turn-off, whitespace-toggle-options): Fix typos.
(whitespace-style, whitespace-chars, whitespace-space, whitespace-hspace,
whitespace-tab, whitespace-newline, whitespace-trailing, whitespace-line,
whitespace-space-before-tab, whitespace-indentation, whitespace-empty,
whitespace-space-after-tab, whitespace-hspace-regexp, whitespace-space-regexp,
whitespace-tab-regexp, whitespace-trailing-regexp,
whitespace-space-before-tab-regexp, whitespace-indentation-regexp,
whitespace-empty-at-bob-regexp, whitespace-empty-at-eob-regexp,
whitespace-space-after-tab-regexp, whitespace-line-column,
whitespace-display-mappings, global-whitespace-toggle-options,
whitespace-cleanup, whitespace-cleanup-region, whitespace-interactive-char):
Doc fixes.
2008-02-01 14:44:44 +00:00
|
|
|
|
If you're using `mule' package, there may be other characters besides:
|
2008-01-17 12:46:55 +00:00
|
|
|
|
|
|
|
|
|
\"\\xA0\" \"\\x8A0\" \"\\x920\" \"\\xE20\" \"\\xF20\"
|
|
|
|
|
|
2008-01-21 12:45:58 +00:00
|
|
|
|
that should be considered HARD SPACE.
|
2008-01-17 12:46:55 +00:00
|
|
|
|
|
|
|
|
|
Here are some examples:
|
|
|
|
|
|
|
|
|
|
\"\\\\(^\\xA0+\\\\)\" \
|
2008-01-21 12:45:58 +00:00
|
|
|
|
visualize only leading HARD SPACEs.
|
2008-01-17 12:46:55 +00:00
|
|
|
|
\"\\\\(\\xA0+$\\\\)\" \
|
2008-01-21 12:45:58 +00:00
|
|
|
|
visualize only trailing HARD SPACEs.
|
2008-01-17 12:46:55 +00:00
|
|
|
|
\"\\\\(^\\xA0+\\\\|\\xA0+$\\\\)\" \
|
2008-01-21 12:45:58 +00:00
|
|
|
|
visualize leading and/or trailing HARD SPACEs.
|
2008-01-17 12:46:55 +00:00
|
|
|
|
\"\\t\\\\(\\xA0+\\\\)\\t\" \
|
2008-01-21 12:45:58 +00:00
|
|
|
|
visualize only HARD SPACEs between TABs.
|
2008-01-17 12:46:55 +00:00
|
|
|
|
|
|
|
|
|
NOTE: Enclose always by \\\\( and \\\\) the elements to highlight.
|
|
|
|
|
Use exactly one pair of enclosing \\\\( and \\\\).
|
|
|
|
|
|
2008-04-26 11:38:50 +00:00
|
|
|
|
Used when `whitespace-style' includes `spaces'."
|
2008-01-17 12:46:55 +00:00
|
|
|
|
:type '(regexp :tag "HARD SPACE Chars")
|
2008-01-31 16:08:29 +00:00
|
|
|
|
:group 'whitespace)
|
2008-01-17 12:46:55 +00:00
|
|
|
|
|
|
|
|
|
|
2008-01-31 16:08:29 +00:00
|
|
|
|
(defcustom whitespace-space-regexp "\\( +\\)"
|
2008-12-03 05:48:14 +00:00
|
|
|
|
"Specify SPACE characters regexp.
|
2008-01-17 12:46:55 +00:00
|
|
|
|
|
(whitespace): Set :version tag to 23.1.
(whitespace-turn-off, whitespace-toggle-options): Fix typos.
(whitespace-style, whitespace-chars, whitespace-space, whitespace-hspace,
whitespace-tab, whitespace-newline, whitespace-trailing, whitespace-line,
whitespace-space-before-tab, whitespace-indentation, whitespace-empty,
whitespace-space-after-tab, whitespace-hspace-regexp, whitespace-space-regexp,
whitespace-tab-regexp, whitespace-trailing-regexp,
whitespace-space-before-tab-regexp, whitespace-indentation-regexp,
whitespace-empty-at-bob-regexp, whitespace-empty-at-eob-regexp,
whitespace-space-after-tab-regexp, whitespace-line-column,
whitespace-display-mappings, global-whitespace-toggle-options,
whitespace-cleanup, whitespace-cleanup-region, whitespace-interactive-char):
Doc fixes.
2008-02-01 14:44:44 +00:00
|
|
|
|
If you're using `mule' package, there may be other characters
|
2008-01-21 12:45:58 +00:00
|
|
|
|
besides \" \" that should be considered SPACE.
|
2008-01-17 12:46:55 +00:00
|
|
|
|
|
|
|
|
|
Here are some examples:
|
|
|
|
|
|
2008-01-21 12:45:58 +00:00
|
|
|
|
\"\\\\(^ +\\\\)\" visualize only leading SPACEs.
|
|
|
|
|
\"\\\\( +$\\\\)\" visualize only trailing SPACEs.
|
2008-01-17 12:46:55 +00:00
|
|
|
|
\"\\\\(^ +\\\\| +$\\\\)\" \
|
2008-01-21 12:45:58 +00:00
|
|
|
|
visualize leading and/or trailing SPACEs.
|
|
|
|
|
\"\\t\\\\( +\\\\)\\t\" visualize only SPACEs between TABs.
|
2008-01-17 12:46:55 +00:00
|
|
|
|
|
|
|
|
|
NOTE: Enclose always by \\\\( and \\\\) the elements to highlight.
|
|
|
|
|
Use exactly one pair of enclosing \\\\( and \\\\).
|
|
|
|
|
|
2008-04-26 11:38:50 +00:00
|
|
|
|
Used when `whitespace-style' includes `spaces'."
|
2008-01-17 12:46:55 +00:00
|
|
|
|
:type '(regexp :tag "SPACE Chars")
|
2008-01-31 16:08:29 +00:00
|
|
|
|
:group 'whitespace)
|
2008-01-17 12:46:55 +00:00
|
|
|
|
|
|
|
|
|
|
2008-01-31 16:08:29 +00:00
|
|
|
|
(defcustom whitespace-tab-regexp "\\(\t+\\)"
|
2008-12-03 05:48:14 +00:00
|
|
|
|
"Specify TAB characters regexp.
|
2008-01-17 12:46:55 +00:00
|
|
|
|
|
(whitespace): Set :version tag to 23.1.
(whitespace-turn-off, whitespace-toggle-options): Fix typos.
(whitespace-style, whitespace-chars, whitespace-space, whitespace-hspace,
whitespace-tab, whitespace-newline, whitespace-trailing, whitespace-line,
whitespace-space-before-tab, whitespace-indentation, whitespace-empty,
whitespace-space-after-tab, whitespace-hspace-regexp, whitespace-space-regexp,
whitespace-tab-regexp, whitespace-trailing-regexp,
whitespace-space-before-tab-regexp, whitespace-indentation-regexp,
whitespace-empty-at-bob-regexp, whitespace-empty-at-eob-regexp,
whitespace-space-after-tab-regexp, whitespace-line-column,
whitespace-display-mappings, global-whitespace-toggle-options,
whitespace-cleanup, whitespace-cleanup-region, whitespace-interactive-char):
Doc fixes.
2008-02-01 14:44:44 +00:00
|
|
|
|
If you're using `mule' package, there may be other characters
|
2008-01-21 12:45:58 +00:00
|
|
|
|
besides \"\\t\" that should be considered TAB.
|
2008-01-17 12:46:55 +00:00
|
|
|
|
|
|
|
|
|
Here are some examples:
|
|
|
|
|
|
2008-01-21 12:45:58 +00:00
|
|
|
|
\"\\\\(^\\t+\\\\)\" visualize only leading TABs.
|
|
|
|
|
\"\\\\(\\t+$\\\\)\" visualize only trailing TABs.
|
2008-01-17 12:46:55 +00:00
|
|
|
|
\"\\\\(^\\t+\\\\|\\t+$\\\\)\" \
|
2008-01-21 12:45:58 +00:00
|
|
|
|
visualize leading and/or trailing TABs.
|
|
|
|
|
\" \\\\(\\t+\\\\) \" visualize only TABs between SPACEs.
|
2008-01-17 12:46:55 +00:00
|
|
|
|
|
|
|
|
|
NOTE: Enclose always by \\\\( and \\\\) the elements to highlight.
|
|
|
|
|
Use exactly one pair of enclosing \\\\( and \\\\).
|
|
|
|
|
|
2008-04-26 11:38:50 +00:00
|
|
|
|
Used when `whitespace-style' includes `tabs'."
|
2008-01-17 12:46:55 +00:00
|
|
|
|
:type '(regexp :tag "TAB Chars")
|
2008-01-31 16:08:29 +00:00
|
|
|
|
:group 'whitespace)
|
2008-01-17 12:46:55 +00:00
|
|
|
|
|
|
|
|
|
|
2008-01-31 16:08:29 +00:00
|
|
|
|
(defcustom whitespace-trailing-regexp
|
2011-05-04 01:02:09 +00:00
|
|
|
|
"\\([\t \u00A0]+\\)$"
|
2008-12-03 05:48:14 +00:00
|
|
|
|
"Specify trailing characters regexp.
|
2008-01-17 12:46:55 +00:00
|
|
|
|
|
(whitespace): Set :version tag to 23.1.
(whitespace-turn-off, whitespace-toggle-options): Fix typos.
(whitespace-style, whitespace-chars, whitespace-space, whitespace-hspace,
whitespace-tab, whitespace-newline, whitespace-trailing, whitespace-line,
whitespace-space-before-tab, whitespace-indentation, whitespace-empty,
whitespace-space-after-tab, whitespace-hspace-regexp, whitespace-space-regexp,
whitespace-tab-regexp, whitespace-trailing-regexp,
whitespace-space-before-tab-regexp, whitespace-indentation-regexp,
whitespace-empty-at-bob-regexp, whitespace-empty-at-eob-regexp,
whitespace-space-after-tab-regexp, whitespace-line-column,
whitespace-display-mappings, global-whitespace-toggle-options,
whitespace-cleanup, whitespace-cleanup-region, whitespace-interactive-char):
Doc fixes.
2008-02-01 14:44:44 +00:00
|
|
|
|
If you're using `mule' package, there may be other characters besides:
|
2008-01-17 12:46:55 +00:00
|
|
|
|
|
2011-05-04 01:02:09 +00:00
|
|
|
|
\" \" \"\\t\" \"\\u00A0\"
|
2008-01-17 12:46:55 +00:00
|
|
|
|
|
2008-01-21 12:45:58 +00:00
|
|
|
|
that should be considered blank.
|
2008-01-17 12:46:55 +00:00
|
|
|
|
|
2008-04-28 23:12:09 +00:00
|
|
|
|
NOTE: Enclose always by \"\\\\(\" and \"\\\\)$\" the elements to highlight.
|
2008-04-27 11:50:47 +00:00
|
|
|
|
Use exactly one pair of enclosing elements above.
|
2008-01-17 12:46:55 +00:00
|
|
|
|
|
2008-04-26 11:38:50 +00:00
|
|
|
|
Used when `whitespace-style' includes `trailing'."
|
2008-01-17 12:46:55 +00:00
|
|
|
|
:type '(regexp :tag "Trailing Chars")
|
2008-01-31 16:08:29 +00:00
|
|
|
|
:group 'whitespace)
|
2008-01-17 12:46:55 +00:00
|
|
|
|
|
|
|
|
|
|
2008-04-16 03:41:17 +00:00
|
|
|
|
(defcustom whitespace-space-before-tab-regexp "\\( +\\)\\(\t+\\)"
|
2008-12-03 05:48:14 +00:00
|
|
|
|
"Specify SPACEs before TAB regexp.
|
2008-01-17 12:46:55 +00:00
|
|
|
|
|
(whitespace): Set :version tag to 23.1.
(whitespace-turn-off, whitespace-toggle-options): Fix typos.
(whitespace-style, whitespace-chars, whitespace-space, whitespace-hspace,
whitespace-tab, whitespace-newline, whitespace-trailing, whitespace-line,
whitespace-space-before-tab, whitespace-indentation, whitespace-empty,
whitespace-space-after-tab, whitespace-hspace-regexp, whitespace-space-regexp,
whitespace-tab-regexp, whitespace-trailing-regexp,
whitespace-space-before-tab-regexp, whitespace-indentation-regexp,
whitespace-empty-at-bob-regexp, whitespace-empty-at-eob-regexp,
whitespace-space-after-tab-regexp, whitespace-line-column,
whitespace-display-mappings, global-whitespace-toggle-options,
whitespace-cleanup, whitespace-cleanup-region, whitespace-interactive-char):
Doc fixes.
2008-02-01 14:44:44 +00:00
|
|
|
|
If you're using `mule' package, there may be other characters besides:
|
2008-01-17 12:46:55 +00:00
|
|
|
|
|
|
|
|
|
\" \" \"\\t\" \"\\xA0\" \"\\x8A0\" \"\\x920\" \"\\xE20\" \
|
|
|
|
|
\"\\xF20\"
|
|
|
|
|
|
2008-01-21 12:45:58 +00:00
|
|
|
|
that should be considered blank.
|
2008-01-17 12:46:55 +00:00
|
|
|
|
|
2008-04-26 11:38:50 +00:00
|
|
|
|
Used when `whitespace-style' includes `space-before-tab',
|
2008-04-16 03:41:17 +00:00
|
|
|
|
`space-before-tab::tab' or `space-before-tab::space'."
|
2008-01-17 12:46:55 +00:00
|
|
|
|
:type '(regexp :tag "SPACEs Before TAB")
|
2008-01-31 16:08:29 +00:00
|
|
|
|
:group 'whitespace)
|
2008-01-17 12:46:55 +00:00
|
|
|
|
|
|
|
|
|
|
2008-01-31 16:08:29 +00:00
|
|
|
|
(defcustom whitespace-indentation-regexp
|
2008-04-16 03:41:17 +00:00
|
|
|
|
'("^\t*\\(\\( \\{%d\\}\\)+\\)[^\n\t]"
|
|
|
|
|
. "^ *\\(\t+\\)[^\n]")
|
2008-12-03 05:48:14 +00:00
|
|
|
|
"Specify regexp for 8 or more SPACEs at beginning of line.
|
2008-01-25 14:09:57 +00:00
|
|
|
|
|
2008-04-16 03:41:17 +00:00
|
|
|
|
It is a cons where the cons car is used for SPACEs visualization
|
|
|
|
|
and the cons cdr is used for TABs visualization.
|
|
|
|
|
|
(whitespace): Set :version tag to 23.1.
(whitespace-turn-off, whitespace-toggle-options): Fix typos.
(whitespace-style, whitespace-chars, whitespace-space, whitespace-hspace,
whitespace-tab, whitespace-newline, whitespace-trailing, whitespace-line,
whitespace-space-before-tab, whitespace-indentation, whitespace-empty,
whitespace-space-after-tab, whitespace-hspace-regexp, whitespace-space-regexp,
whitespace-tab-regexp, whitespace-trailing-regexp,
whitespace-space-before-tab-regexp, whitespace-indentation-regexp,
whitespace-empty-at-bob-regexp, whitespace-empty-at-eob-regexp,
whitespace-space-after-tab-regexp, whitespace-line-column,
whitespace-display-mappings, global-whitespace-toggle-options,
whitespace-cleanup, whitespace-cleanup-region, whitespace-interactive-char):
Doc fixes.
2008-02-01 14:44:44 +00:00
|
|
|
|
If you're using `mule' package, there may be other characters besides:
|
2008-01-25 14:09:57 +00:00
|
|
|
|
|
|
|
|
|
\" \" \"\\t\" \"\\xA0\" \"\\x8A0\" \"\\x920\" \"\\xE20\" \
|
|
|
|
|
\"\\xF20\"
|
|
|
|
|
|
|
|
|
|
that should be considered blank.
|
|
|
|
|
|
2008-04-26 11:38:50 +00:00
|
|
|
|
Used when `whitespace-style' includes `indentation',
|
2008-04-16 03:41:17 +00:00
|
|
|
|
`indentation::tab' or `indentation::space'."
|
|
|
|
|
:type '(cons (regexp :tag "Indentation SPACEs")
|
|
|
|
|
(regexp :tag "Indentation TABs"))
|
2008-01-31 16:08:29 +00:00
|
|
|
|
:group 'whitespace)
|
2008-01-25 14:09:57 +00:00
|
|
|
|
|
|
|
|
|
|
2010-08-21 04:43:04 +00:00
|
|
|
|
(defcustom whitespace-empty-at-bob-regexp "^\\(\\([ \t]*\n\\)+\\)"
|
2008-12-03 05:48:14 +00:00
|
|
|
|
"Specify regexp for empty lines at beginning of buffer.
|
2008-01-25 14:09:57 +00:00
|
|
|
|
|
(whitespace): Set :version tag to 23.1.
(whitespace-turn-off, whitespace-toggle-options): Fix typos.
(whitespace-style, whitespace-chars, whitespace-space, whitespace-hspace,
whitespace-tab, whitespace-newline, whitespace-trailing, whitespace-line,
whitespace-space-before-tab, whitespace-indentation, whitespace-empty,
whitespace-space-after-tab, whitespace-hspace-regexp, whitespace-space-regexp,
whitespace-tab-regexp, whitespace-trailing-regexp,
whitespace-space-before-tab-regexp, whitespace-indentation-regexp,
whitespace-empty-at-bob-regexp, whitespace-empty-at-eob-regexp,
whitespace-space-after-tab-regexp, whitespace-line-column,
whitespace-display-mappings, global-whitespace-toggle-options,
whitespace-cleanup, whitespace-cleanup-region, whitespace-interactive-char):
Doc fixes.
2008-02-01 14:44:44 +00:00
|
|
|
|
If you're using `mule' package, there may be other characters besides:
|
2008-01-25 14:09:57 +00:00
|
|
|
|
|
|
|
|
|
\" \" \"\\t\" \"\\xA0\" \"\\x8A0\" \"\\x920\" \"\\xE20\" \
|
|
|
|
|
\"\\xF20\"
|
|
|
|
|
|
|
|
|
|
that should be considered blank.
|
|
|
|
|
|
2008-04-26 11:38:50 +00:00
|
|
|
|
Used when `whitespace-style' includes `empty'."
|
2008-01-25 14:09:57 +00:00
|
|
|
|
:type '(regexp :tag "Empty Lines At Beginning Of Buffer")
|
2008-01-31 16:08:29 +00:00
|
|
|
|
:group 'whitespace)
|
2008-01-25 14:09:57 +00:00
|
|
|
|
|
|
|
|
|
|
2010-08-21 04:43:04 +00:00
|
|
|
|
(defcustom whitespace-empty-at-eob-regexp "^\\([ \t\n]+\\)"
|
2008-12-03 05:48:14 +00:00
|
|
|
|
"Specify regexp for empty lines at end of buffer.
|
2008-01-25 14:09:57 +00:00
|
|
|
|
|
(whitespace): Set :version tag to 23.1.
(whitespace-turn-off, whitespace-toggle-options): Fix typos.
(whitespace-style, whitespace-chars, whitespace-space, whitespace-hspace,
whitespace-tab, whitespace-newline, whitespace-trailing, whitespace-line,
whitespace-space-before-tab, whitespace-indentation, whitespace-empty,
whitespace-space-after-tab, whitespace-hspace-regexp, whitespace-space-regexp,
whitespace-tab-regexp, whitespace-trailing-regexp,
whitespace-space-before-tab-regexp, whitespace-indentation-regexp,
whitespace-empty-at-bob-regexp, whitespace-empty-at-eob-regexp,
whitespace-space-after-tab-regexp, whitespace-line-column,
whitespace-display-mappings, global-whitespace-toggle-options,
whitespace-cleanup, whitespace-cleanup-region, whitespace-interactive-char):
Doc fixes.
2008-02-01 14:44:44 +00:00
|
|
|
|
If you're using `mule' package, there may be other characters besides:
|
2008-01-25 14:09:57 +00:00
|
|
|
|
|
|
|
|
|
\" \" \"\\t\" \"\\xA0\" \"\\x8A0\" \"\\x920\" \"\\xE20\" \
|
|
|
|
|
\"\\xF20\"
|
|
|
|
|
|
|
|
|
|
that should be considered blank.
|
|
|
|
|
|
2008-04-26 11:38:50 +00:00
|
|
|
|
Used when `whitespace-style' includes `empty'."
|
2008-01-25 14:09:57 +00:00
|
|
|
|
:type '(regexp :tag "Empty Lines At End Of Buffer")
|
2008-01-31 16:08:29 +00:00
|
|
|
|
:group 'whitespace)
|
2008-01-25 14:09:57 +00:00
|
|
|
|
|
|
|
|
|
|
2008-04-16 03:41:17 +00:00
|
|
|
|
(defcustom whitespace-space-after-tab-regexp
|
|
|
|
|
'("\t+\\(\\( \\{%d\\}\\)+\\)"
|
|
|
|
|
. "\\(\t+\\) +")
|
2008-12-03 05:48:14 +00:00
|
|
|
|
"Specify regexp for 8 or more SPACEs after TAB.
|
2008-01-25 14:09:57 +00:00
|
|
|
|
|
2008-04-16 03:41:17 +00:00
|
|
|
|
It is a cons where the cons car is used for SPACEs visualization
|
|
|
|
|
and the cons cdr is used for TABs visualization.
|
|
|
|
|
|
(whitespace): Set :version tag to 23.1.
(whitespace-turn-off, whitespace-toggle-options): Fix typos.
(whitespace-style, whitespace-chars, whitespace-space, whitespace-hspace,
whitespace-tab, whitespace-newline, whitespace-trailing, whitespace-line,
whitespace-space-before-tab, whitespace-indentation, whitespace-empty,
whitespace-space-after-tab, whitespace-hspace-regexp, whitespace-space-regexp,
whitespace-tab-regexp, whitespace-trailing-regexp,
whitespace-space-before-tab-regexp, whitespace-indentation-regexp,
whitespace-empty-at-bob-regexp, whitespace-empty-at-eob-regexp,
whitespace-space-after-tab-regexp, whitespace-line-column,
whitespace-display-mappings, global-whitespace-toggle-options,
whitespace-cleanup, whitespace-cleanup-region, whitespace-interactive-char):
Doc fixes.
2008-02-01 14:44:44 +00:00
|
|
|
|
If you're using `mule' package, there may be other characters besides:
|
2008-01-25 14:09:57 +00:00
|
|
|
|
|
|
|
|
|
\" \" \"\\t\" \"\\xA0\" \"\\x8A0\" \"\\x920\" \"\\xE20\" \
|
|
|
|
|
\"\\xF20\"
|
|
|
|
|
|
|
|
|
|
that should be considered blank.
|
|
|
|
|
|
2008-04-26 11:38:50 +00:00
|
|
|
|
Used when `whitespace-style' includes `space-after-tab',
|
2008-04-16 03:41:17 +00:00
|
|
|
|
`space-after-tab::tab' or `space-after-tab::space'."
|
2008-01-25 14:09:57 +00:00
|
|
|
|
:type '(regexp :tag "SPACEs After TAB")
|
2008-01-31 16:08:29 +00:00
|
|
|
|
:group 'whitespace)
|
2008-01-25 14:09:57 +00:00
|
|
|
|
|
|
|
|
|
|
2008-01-31 16:08:29 +00:00
|
|
|
|
(defcustom whitespace-line-column 80
|
2008-12-03 05:48:14 +00:00
|
|
|
|
"Specify column beyond which the line is highlighted.
|
2008-01-17 12:46:55 +00:00
|
|
|
|
|
2010-08-25 02:27:58 +00:00
|
|
|
|
It must be an integer or nil. If nil, the `fill-column' variable value is
|
|
|
|
|
used.
|
|
|
|
|
|
2008-04-26 11:38:50 +00:00
|
|
|
|
Used when `whitespace-style' includes `lines' or `lines-tail'."
|
2010-08-25 02:27:58 +00:00
|
|
|
|
:type '(choice :tag "Line Length Limit"
|
|
|
|
|
(integer :tag "Line Length")
|
|
|
|
|
(const :tag "Use fill-column" nil))
|
2008-01-31 16:08:29 +00:00
|
|
|
|
:group 'whitespace)
|
2008-01-17 12:46:55 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;; Hacked from `visible-whitespace-mappings' in visws.el
|
2008-01-31 16:08:29 +00:00
|
|
|
|
(defcustom whitespace-display-mappings
|
2008-01-17 12:46:55 +00:00
|
|
|
|
'(
|
2009-09-25 02:23:51 +00:00
|
|
|
|
(space-mark ?\ [?\u00B7] [?.]) ; space - centered dot
|
|
|
|
|
(space-mark ?\xA0 [?\u00A4] [?_]) ; hard space - currency
|
2008-01-31 16:08:29 +00:00
|
|
|
|
;; NEWLINE is displayed using the face `whitespace-newline'
|
2008-04-16 03:41:17 +00:00
|
|
|
|
(newline-mark ?\n [?$ ?\n]) ; eol - dollar sign
|
|
|
|
|
;; (newline-mark ?\n [?\u21B5 ?\n] [?$ ?\n]) ; eol - downwards arrow
|
2009-09-25 02:23:51 +00:00
|
|
|
|
;; (newline-mark ?\n [?\u00B6 ?\n] [?$ ?\n]) ; eol - pilcrow
|
2012-08-03 11:51:11 +00:00
|
|
|
|
;; (newline-mark ?\n [?\u00AF ?\n] [?$ ?\n]) ; eol - overscore
|
|
|
|
|
;; (newline-mark ?\n [?\u00AC ?\n] [?$ ?\n]) ; eol - negation
|
|
|
|
|
;; (newline-mark ?\n [?\u00B0 ?\n] [?$ ?\n]) ; eol - degrees
|
2008-01-17 12:46:55 +00:00
|
|
|
|
;;
|
|
|
|
|
;; WARNING: the mapping below has a problem.
|
|
|
|
|
;; When a TAB occupies exactly one column, it will display the
|
|
|
|
|
;; character ?\xBB at that column followed by a TAB which goes to
|
|
|
|
|
;; the next TAB column.
|
|
|
|
|
;; If this is a problem for you, please, comment the line below.
|
2009-09-25 02:23:51 +00:00
|
|
|
|
(tab-mark ?\t [?\u00BB ?\t] [?\\ ?\t]) ; tab - left quote mark
|
2008-01-17 12:46:55 +00:00
|
|
|
|
)
|
2008-12-03 05:48:14 +00:00
|
|
|
|
"Specify an alist of mappings for displaying characters.
|
2008-01-17 12:46:55 +00:00
|
|
|
|
|
|
|
|
|
Each element has the following form:
|
|
|
|
|
|
2008-04-16 03:41:17 +00:00
|
|
|
|
(KIND CHAR VECTOR...)
|
2008-01-17 12:46:55 +00:00
|
|
|
|
|
|
|
|
|
Where:
|
|
|
|
|
|
2008-04-16 03:41:17 +00:00
|
|
|
|
KIND is the kind of character.
|
|
|
|
|
It can be one of the following symbols:
|
|
|
|
|
|
|
|
|
|
tab-mark for TAB character
|
|
|
|
|
|
|
|
|
|
space-mark for SPACE or HARD SPACE character
|
|
|
|
|
|
|
|
|
|
newline-mark for NEWLINE character
|
|
|
|
|
|
2008-01-17 12:46:55 +00:00
|
|
|
|
CHAR is the character to be mapped.
|
|
|
|
|
|
|
|
|
|
VECTOR is a vector of characters to be displayed in place of CHAR.
|
|
|
|
|
The first display vector that can be displayed is used;
|
|
|
|
|
if no display vector for a mapping can be displayed, then
|
|
|
|
|
that character is displayed unmodified.
|
|
|
|
|
|
|
|
|
|
The NEWLINE character is displayed using the face given by
|
2008-04-16 03:41:17 +00:00
|
|
|
|
`whitespace-newline' variable.
|
2008-01-17 12:46:55 +00:00
|
|
|
|
|
2008-04-26 11:38:50 +00:00
|
|
|
|
Used when `whitespace-style' includes `tab-mark', `space-mark' or
|
|
|
|
|
`newline-mark'."
|
2008-01-17 12:46:55 +00:00
|
|
|
|
:type '(repeat
|
|
|
|
|
(list :tag "Character Mapping"
|
2008-04-16 03:41:17 +00:00
|
|
|
|
(choice :tag "Char Kind"
|
|
|
|
|
(const :tag "Tab" tab-mark)
|
|
|
|
|
(const :tag "Space" space-mark)
|
|
|
|
|
(const :tag "Newline" newline-mark))
|
2008-01-17 12:46:55 +00:00
|
|
|
|
(character :tag "Char")
|
|
|
|
|
(repeat :inline t :tag "Vector List"
|
|
|
|
|
(vector :tag ""
|
|
|
|
|
(repeat :inline t
|
|
|
|
|
:tag "Vector Characters"
|
|
|
|
|
(character :tag "Char"))))))
|
2008-01-31 16:08:29 +00:00
|
|
|
|
:group 'whitespace)
|
2008-01-17 12:46:55 +00:00
|
|
|
|
|
|
|
|
|
|
2008-01-31 16:08:29 +00:00
|
|
|
|
(defcustom whitespace-global-modes t
|
2008-12-03 05:48:14 +00:00
|
|
|
|
"Modes for which global `whitespace-mode' is automagically turned on.
|
2008-01-17 12:46:55 +00:00
|
|
|
|
|
2008-01-31 16:08:29 +00:00
|
|
|
|
Global `whitespace-mode' is controlled by the command
|
|
|
|
|
`global-whitespace-mode'.
|
2008-01-17 12:46:55 +00:00
|
|
|
|
|
2008-01-31 16:08:29 +00:00
|
|
|
|
If nil, means no modes have `whitespace-mode' automatically
|
2008-01-17 12:46:55 +00:00
|
|
|
|
turned on.
|
2008-01-31 16:08:29 +00:00
|
|
|
|
|
|
|
|
|
If t, all modes that support `whitespace-mode' have it
|
|
|
|
|
automatically turned on.
|
|
|
|
|
|
|
|
|
|
Else it should be a list of `major-mode' symbol names for which
|
|
|
|
|
`whitespace-mode' should be automatically turned on. The sense
|
2008-01-17 12:46:55 +00:00
|
|
|
|
of the list is negated if it begins with `not'. For example:
|
|
|
|
|
|
|
|
|
|
(c-mode c++-mode)
|
|
|
|
|
|
2008-01-31 16:08:29 +00:00
|
|
|
|
means that `whitespace-mode' is turned on for buffers in C and
|
|
|
|
|
C++ modes only."
|
2008-03-01 19:00:24 +00:00
|
|
|
|
:type '(choice :tag "Global Modes"
|
|
|
|
|
(const :tag "None" nil)
|
2008-01-25 14:09:57 +00:00
|
|
|
|
(const :tag "All" t)
|
|
|
|
|
(set :menu-tag "Mode Specific" :tag "Modes"
|
2008-01-17 12:46:55 +00:00
|
|
|
|
:value (not)
|
|
|
|
|
(const :tag "Except" not)
|
|
|
|
|
(repeat :inline t
|
2008-01-25 14:09:57 +00:00
|
|
|
|
(symbol :tag "Mode"))))
|
2008-01-31 16:08:29 +00:00
|
|
|
|
:group 'whitespace)
|
2008-01-17 12:46:55 +00:00
|
|
|
|
|
2008-03-01 19:00:24 +00:00
|
|
|
|
|
|
|
|
|
(defcustom whitespace-action nil
|
2008-12-03 05:48:14 +00:00
|
|
|
|
"Specify which action is taken when a buffer is visited or written.
|
2008-03-01 19:00:24 +00:00
|
|
|
|
|
|
|
|
|
It's a list containing some or all of the following values:
|
|
|
|
|
|
|
|
|
|
nil no action is taken.
|
|
|
|
|
|
|
|
|
|
cleanup cleanup any bogus whitespace always when local
|
|
|
|
|
whitespace is turned on.
|
|
|
|
|
See `whitespace-cleanup' and
|
|
|
|
|
`whitespace-cleanup-region'.
|
|
|
|
|
|
|
|
|
|
report-on-bogus report if there is any bogus whitespace always
|
|
|
|
|
when local whitespace is turned on.
|
|
|
|
|
|
|
|
|
|
auto-cleanup cleanup any bogus whitespace when buffer is
|
2008-10-02 00:49:49 +00:00
|
|
|
|
written.
|
2008-03-01 19:00:24 +00:00
|
|
|
|
See `whitespace-cleanup' and
|
|
|
|
|
`whitespace-cleanup-region'.
|
|
|
|
|
|
|
|
|
|
abort-on-bogus abort if there is any bogus whitespace and the
|
2008-10-02 00:49:49 +00:00
|
|
|
|
buffer is written.
|
2008-03-01 19:00:24 +00:00
|
|
|
|
|
2008-10-02 00:49:49 +00:00
|
|
|
|
warn-if-read-only give a warning if `cleanup' or `auto-cleanup'
|
2008-09-06 00:19:31 +00:00
|
|
|
|
is included in `whitespace-action' and the
|
|
|
|
|
buffer is read-only.
|
|
|
|
|
|
2008-03-01 19:00:24 +00:00
|
|
|
|
Any other value is treated as nil."
|
|
|
|
|
:type '(choice :tag "Actions"
|
|
|
|
|
(const :tag "None" nil)
|
|
|
|
|
(repeat :tag "Action List"
|
|
|
|
|
(choice :tag "Action"
|
|
|
|
|
(const :tag "Cleanup When On" cleanup)
|
|
|
|
|
(const :tag "Report On Bogus" report-on-bogus)
|
|
|
|
|
(const :tag "Auto Cleanup" auto-cleanup)
|
2008-09-06 00:19:31 +00:00
|
|
|
|
(const :tag "Abort On Bogus" abort-on-bogus)
|
2008-10-02 00:49:49 +00:00
|
|
|
|
(const :tag "Warn If Read-Only" warn-if-read-only))))
|
2008-03-01 19:00:24 +00:00
|
|
|
|
:group 'whitespace)
|
|
|
|
|
|
2008-01-17 12:46:55 +00:00
|
|
|
|
|
|
|
|
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
|
|
|
;;;; User commands - Local mode
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;;###autoload
|
2008-01-31 16:08:29 +00:00
|
|
|
|
(define-minor-mode whitespace-mode
|
Fix minor mode docstrings for the new meaning of a nil ARG.
* abbrev.el (abbrev-mode):
* allout.el (allout-mode):
* autoinsert.el (auto-insert-mode):
* autoarg.el (autoarg-mode, autoarg-kp-mode):
* autorevert.el (auto-revert-mode, auto-revert-tail-mode)
(global-auto-revert-mode):
* battery.el (display-battery-mode):
* composite.el (global-auto-composition-mode)
(auto-composition-mode):
* delsel.el (delete-selection-mode):
* desktop.el (desktop-save-mode):
* dired-x.el (dired-omit-mode):
* dirtrack.el (dirtrack-mode):
* doc-view.el (doc-view-minor-mode):
* double.el (double-mode):
* electric.el (electric-indent-mode, electric-pair-mode):
* emacs-lock.el (emacs-lock-mode):
* epa-hook.el (auto-encryption-mode):
* follow.el (follow-mode):
* font-core.el (font-lock-mode):
* frame.el (auto-raise-mode, auto-lower-mode, blink-cursor-mode):
* help.el (temp-buffer-resize-mode):
* hilit-chg.el (highlight-changes-mode)
(highlight-changes-visible-mode):
* hi-lock.el (hi-lock-mode):
* hl-line.el (hl-line-mode, global-hl-line-mode):
* icomplete.el (icomplete-mode):
* ido.el (ido-everywhere):
* image-file.el (auto-image-file-mode):
* image-mode.el (image-minor-mode):
* iswitchb.el (iswitchb-mode):
* jka-cmpr-hook.el (auto-compression-mode):
* linum.el (linum-mode):
* longlines.el (longlines-mode):
* master.el (master-mode):
* mb-depth.el (minibuffer-depth-indicate-mode):
* menu-bar.el (menu-bar-mode):
* minibuf-eldef.el (minibuffer-electric-default-mode):
* mouse-sel.el (mouse-sel-mode):
* msb.el (msb-mode):
* mwheel.el (mouse-wheel-mode):
* outline.el (outline-minor-mode):
* paren.el (show-paren-mode):
* recentf.el (recentf-mode):
* reveal.el (reveal-mode, global-reveal-mode):
* rfn-eshadow.el (file-name-shadow-mode):
* ruler-mode.el (ruler-mode):
* savehist.el (savehist-mode):
* scroll-all.el (scroll-all-mode):
* scroll-bar.el (scroll-bar-mode):
* server.el (server-mode):
* shell.el (shell-dirtrack-mode):
* simple.el (auto-fill-mode, transient-mark-mode)
(visual-line-mode, overwrite-mode, binary-overwrite-mode)
(line-number-mode, column-number-mode, size-indication-mode)
(auto-save-mode, normal-erase-is-backspace-mode, visible-mode):
* strokes.el (strokes-mode):
* time.el (display-time-mode):
* t-mouse.el (gpm-mouse-mode):
* tool-bar.el (tool-bar-mode):
* tooltip.el (tooltip-mode):
* type-break.el (type-break-mode-line-message-mode)
(type-break-query-mode):
* view.el (view-mode):
* whitespace.el (whitespace-mode, whitespace-newline-mode)
(global-whitespace-mode, global-whitespace-newline-mode):
* xt-mouse.el (xterm-mouse-mode): Doc fix.
* emacs-lisp/easy-mmode.el (define-globalized-minor-mode): Fix
autogenerated docstring.
2011-10-19 12:54:24 +00:00
|
|
|
|
"Toggle whitespace visualization (Whitespace mode).
|
|
|
|
|
With a prefix argument ARG, enable Whitespace mode if ARG is
|
|
|
|
|
positive, and disable it otherwise. If called from Lisp, enable
|
|
|
|
|
the mode if ARG is omitted or nil.
|
2008-08-06 03:35:04 +00:00
|
|
|
|
|
|
|
|
|
See also `whitespace-style', `whitespace-newline' and
|
|
|
|
|
`whitespace-display-mappings'."
|
2008-01-31 16:08:29 +00:00
|
|
|
|
:lighter " ws"
|
2008-01-17 12:46:55 +00:00
|
|
|
|
:init-value nil
|
|
|
|
|
:global nil
|
2008-01-31 16:08:29 +00:00
|
|
|
|
:group 'whitespace
|
2008-01-17 12:46:55 +00:00
|
|
|
|
(cond
|
|
|
|
|
(noninteractive ; running a batch job
|
2008-01-31 16:08:29 +00:00
|
|
|
|
(setq whitespace-mode nil))
|
|
|
|
|
(whitespace-mode ; whitespace-mode on
|
2008-03-01 19:00:24 +00:00
|
|
|
|
(whitespace-turn-on)
|
|
|
|
|
(whitespace-action-when-on))
|
2008-01-31 16:08:29 +00:00
|
|
|
|
(t ; whitespace-mode off
|
|
|
|
|
(whitespace-turn-off))))
|
2008-01-17 12:46:55 +00:00
|
|
|
|
|
2008-07-24 04:12:27 +00:00
|
|
|
|
|
|
|
|
|
;;;###autoload
|
|
|
|
|
(define-minor-mode whitespace-newline-mode
|
Fix minor mode docstrings for the new meaning of a nil ARG.
* abbrev.el (abbrev-mode):
* allout.el (allout-mode):
* autoinsert.el (auto-insert-mode):
* autoarg.el (autoarg-mode, autoarg-kp-mode):
* autorevert.el (auto-revert-mode, auto-revert-tail-mode)
(global-auto-revert-mode):
* battery.el (display-battery-mode):
* composite.el (global-auto-composition-mode)
(auto-composition-mode):
* delsel.el (delete-selection-mode):
* desktop.el (desktop-save-mode):
* dired-x.el (dired-omit-mode):
* dirtrack.el (dirtrack-mode):
* doc-view.el (doc-view-minor-mode):
* double.el (double-mode):
* electric.el (electric-indent-mode, electric-pair-mode):
* emacs-lock.el (emacs-lock-mode):
* epa-hook.el (auto-encryption-mode):
* follow.el (follow-mode):
* font-core.el (font-lock-mode):
* frame.el (auto-raise-mode, auto-lower-mode, blink-cursor-mode):
* help.el (temp-buffer-resize-mode):
* hilit-chg.el (highlight-changes-mode)
(highlight-changes-visible-mode):
* hi-lock.el (hi-lock-mode):
* hl-line.el (hl-line-mode, global-hl-line-mode):
* icomplete.el (icomplete-mode):
* ido.el (ido-everywhere):
* image-file.el (auto-image-file-mode):
* image-mode.el (image-minor-mode):
* iswitchb.el (iswitchb-mode):
* jka-cmpr-hook.el (auto-compression-mode):
* linum.el (linum-mode):
* longlines.el (longlines-mode):
* master.el (master-mode):
* mb-depth.el (minibuffer-depth-indicate-mode):
* menu-bar.el (menu-bar-mode):
* minibuf-eldef.el (minibuffer-electric-default-mode):
* mouse-sel.el (mouse-sel-mode):
* msb.el (msb-mode):
* mwheel.el (mouse-wheel-mode):
* outline.el (outline-minor-mode):
* paren.el (show-paren-mode):
* recentf.el (recentf-mode):
* reveal.el (reveal-mode, global-reveal-mode):
* rfn-eshadow.el (file-name-shadow-mode):
* ruler-mode.el (ruler-mode):
* savehist.el (savehist-mode):
* scroll-all.el (scroll-all-mode):
* scroll-bar.el (scroll-bar-mode):
* server.el (server-mode):
* shell.el (shell-dirtrack-mode):
* simple.el (auto-fill-mode, transient-mark-mode)
(visual-line-mode, overwrite-mode, binary-overwrite-mode)
(line-number-mode, column-number-mode, size-indication-mode)
(auto-save-mode, normal-erase-is-backspace-mode, visible-mode):
* strokes.el (strokes-mode):
* time.el (display-time-mode):
* t-mouse.el (gpm-mouse-mode):
* tool-bar.el (tool-bar-mode):
* tooltip.el (tooltip-mode):
* type-break.el (type-break-mode-line-message-mode)
(type-break-query-mode):
* view.el (view-mode):
* whitespace.el (whitespace-mode, whitespace-newline-mode)
(global-whitespace-mode, global-whitespace-newline-mode):
* xt-mouse.el (xterm-mouse-mode): Doc fix.
* emacs-lisp/easy-mmode.el (define-globalized-minor-mode): Fix
autogenerated docstring.
2011-10-19 12:54:24 +00:00
|
|
|
|
"Toggle newline visualization (Whitespace Newline mode).
|
|
|
|
|
With a prefix argument ARG, enable Whitespace Newline mode if ARG
|
|
|
|
|
is positive, and disable it otherwise. If called from Lisp,
|
|
|
|
|
enable the mode if ARG is omitted or nil.
|
2008-07-24 04:12:27 +00:00
|
|
|
|
|
2008-08-06 03:35:04 +00:00
|
|
|
|
Use `whitespace-newline-mode' only for NEWLINE visualization
|
|
|
|
|
exclusively. For other visualizations, including NEWLINE
|
|
|
|
|
visualization together with (HARD) SPACEs and/or TABs, please,
|
|
|
|
|
use `whitespace-mode'.
|
|
|
|
|
|
|
|
|
|
See also `whitespace-newline' and `whitespace-display-mappings'."
|
2008-07-24 04:12:27 +00:00
|
|
|
|
:lighter " nl"
|
|
|
|
|
:init-value nil
|
|
|
|
|
:global nil
|
|
|
|
|
:group 'whitespace
|
2011-10-31 01:15:40 +00:00
|
|
|
|
(let ((whitespace-style '(face newline-mark newline)))
|
|
|
|
|
(whitespace-mode (if whitespace-newline-mode
|
|
|
|
|
1 -1)))
|
2011-10-31 00:37:09 +00:00
|
|
|
|
;; sync states (running a batch job)
|
|
|
|
|
(setq whitespace-newline-mode whitespace-mode))
|
2008-07-24 04:12:27 +00:00
|
|
|
|
|
2008-01-17 12:46:55 +00:00
|
|
|
|
|
|
|
|
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
|
|
|
;;;; User commands - Global mode
|
|
|
|
|
|
|
|
|
|
|
2008-04-16 03:41:17 +00:00
|
|
|
|
;;;###autoload
|
2008-01-31 16:08:29 +00:00
|
|
|
|
(define-minor-mode global-whitespace-mode
|
Fix minor mode docstrings for the new meaning of a nil ARG.
* abbrev.el (abbrev-mode):
* allout.el (allout-mode):
* autoinsert.el (auto-insert-mode):
* autoarg.el (autoarg-mode, autoarg-kp-mode):
* autorevert.el (auto-revert-mode, auto-revert-tail-mode)
(global-auto-revert-mode):
* battery.el (display-battery-mode):
* composite.el (global-auto-composition-mode)
(auto-composition-mode):
* delsel.el (delete-selection-mode):
* desktop.el (desktop-save-mode):
* dired-x.el (dired-omit-mode):
* dirtrack.el (dirtrack-mode):
* doc-view.el (doc-view-minor-mode):
* double.el (double-mode):
* electric.el (electric-indent-mode, electric-pair-mode):
* emacs-lock.el (emacs-lock-mode):
* epa-hook.el (auto-encryption-mode):
* follow.el (follow-mode):
* font-core.el (font-lock-mode):
* frame.el (auto-raise-mode, auto-lower-mode, blink-cursor-mode):
* help.el (temp-buffer-resize-mode):
* hilit-chg.el (highlight-changes-mode)
(highlight-changes-visible-mode):
* hi-lock.el (hi-lock-mode):
* hl-line.el (hl-line-mode, global-hl-line-mode):
* icomplete.el (icomplete-mode):
* ido.el (ido-everywhere):
* image-file.el (auto-image-file-mode):
* image-mode.el (image-minor-mode):
* iswitchb.el (iswitchb-mode):
* jka-cmpr-hook.el (auto-compression-mode):
* linum.el (linum-mode):
* longlines.el (longlines-mode):
* master.el (master-mode):
* mb-depth.el (minibuffer-depth-indicate-mode):
* menu-bar.el (menu-bar-mode):
* minibuf-eldef.el (minibuffer-electric-default-mode):
* mouse-sel.el (mouse-sel-mode):
* msb.el (msb-mode):
* mwheel.el (mouse-wheel-mode):
* outline.el (outline-minor-mode):
* paren.el (show-paren-mode):
* recentf.el (recentf-mode):
* reveal.el (reveal-mode, global-reveal-mode):
* rfn-eshadow.el (file-name-shadow-mode):
* ruler-mode.el (ruler-mode):
* savehist.el (savehist-mode):
* scroll-all.el (scroll-all-mode):
* scroll-bar.el (scroll-bar-mode):
* server.el (server-mode):
* shell.el (shell-dirtrack-mode):
* simple.el (auto-fill-mode, transient-mark-mode)
(visual-line-mode, overwrite-mode, binary-overwrite-mode)
(line-number-mode, column-number-mode, size-indication-mode)
(auto-save-mode, normal-erase-is-backspace-mode, visible-mode):
* strokes.el (strokes-mode):
* time.el (display-time-mode):
* t-mouse.el (gpm-mouse-mode):
* tool-bar.el (tool-bar-mode):
* tooltip.el (tooltip-mode):
* type-break.el (type-break-mode-line-message-mode)
(type-break-query-mode):
* view.el (view-mode):
* whitespace.el (whitespace-mode, whitespace-newline-mode)
(global-whitespace-mode, global-whitespace-newline-mode):
* xt-mouse.el (xterm-mouse-mode): Doc fix.
* emacs-lisp/easy-mmode.el (define-globalized-minor-mode): Fix
autogenerated docstring.
2011-10-19 12:54:24 +00:00
|
|
|
|
"Toggle whitespace visualization globally (Global Whitespace mode).
|
|
|
|
|
With a prefix argument ARG, enable Global Whitespace mode if ARG
|
|
|
|
|
is positive, and disable it otherwise. If called from Lisp,
|
|
|
|
|
enable it if ARG is omitted or nil.
|
2008-08-06 03:35:04 +00:00
|
|
|
|
|
|
|
|
|
See also `whitespace-style', `whitespace-newline' and
|
|
|
|
|
`whitespace-display-mappings'."
|
2008-02-01 10:25:35 +00:00
|
|
|
|
:lighter " WS"
|
2008-01-17 12:46:55 +00:00
|
|
|
|
:init-value nil
|
|
|
|
|
:global t
|
2008-01-31 16:08:29 +00:00
|
|
|
|
:group 'whitespace
|
2008-01-17 12:46:55 +00:00
|
|
|
|
(cond
|
|
|
|
|
(noninteractive ; running a batch job
|
2008-01-31 16:08:29 +00:00
|
|
|
|
(setq global-whitespace-mode nil))
|
|
|
|
|
(global-whitespace-mode ; global-whitespace-mode on
|
2011-05-04 01:02:09 +00:00
|
|
|
|
(save-current-buffer
|
2008-03-01 19:00:24 +00:00
|
|
|
|
(add-hook 'find-file-hook 'whitespace-turn-on-if-enabled)
|
2011-04-30 15:15:07 +00:00
|
|
|
|
(add-hook 'after-change-major-mode-hook 'whitespace-turn-on-if-enabled)
|
2008-01-17 12:46:55 +00:00
|
|
|
|
(dolist (buffer (buffer-list)) ; adjust all local mode
|
|
|
|
|
(set-buffer buffer)
|
2008-01-31 16:08:29 +00:00
|
|
|
|
(unless whitespace-mode
|
|
|
|
|
(whitespace-turn-on-if-enabled)))))
|
|
|
|
|
(t ; global-whitespace-mode off
|
2011-05-04 01:02:09 +00:00
|
|
|
|
(save-current-buffer
|
2008-02-01 18:52:51 +00:00
|
|
|
|
(remove-hook 'find-file-hook 'whitespace-turn-on-if-enabled)
|
2011-04-30 15:15:07 +00:00
|
|
|
|
(remove-hook 'after-change-major-mode-hook 'whitespace-turn-on-if-enabled)
|
2008-01-17 12:46:55 +00:00
|
|
|
|
(dolist (buffer (buffer-list)) ; adjust all local mode
|
|
|
|
|
(set-buffer buffer)
|
2008-02-02 17:41:55 +00:00
|
|
|
|
(unless whitespace-mode
|
2008-01-31 16:08:29 +00:00
|
|
|
|
(whitespace-turn-off)))))))
|
2008-01-17 12:46:55 +00:00
|
|
|
|
|
|
|
|
|
|
2008-01-31 16:08:29 +00:00
|
|
|
|
(defun whitespace-turn-on-if-enabled ()
|
2008-01-17 12:46:55 +00:00
|
|
|
|
(when (cond
|
2008-01-31 16:08:29 +00:00
|
|
|
|
((eq whitespace-global-modes t))
|
|
|
|
|
((listp whitespace-global-modes)
|
|
|
|
|
(if (eq (car-safe whitespace-global-modes) 'not)
|
|
|
|
|
(not (memq major-mode (cdr whitespace-global-modes)))
|
|
|
|
|
(memq major-mode whitespace-global-modes)))
|
2008-01-17 12:46:55 +00:00
|
|
|
|
(t nil))
|
|
|
|
|
(let (inhibit-quit)
|
2008-01-31 16:08:29 +00:00
|
|
|
|
;; Don't turn on whitespace mode if...
|
2008-01-17 12:46:55 +00:00
|
|
|
|
(or
|
|
|
|
|
;; ...we don't have a display (we're running a batch job)
|
|
|
|
|
noninteractive
|
|
|
|
|
;; ...or if the buffer is invisible (name starts with a space)
|
|
|
|
|
(eq (aref (buffer-name) 0) ?\ )
|
|
|
|
|
;; ...or if the buffer is temporary (name starts with *)
|
|
|
|
|
(and (eq (aref (buffer-name) 0) ?*)
|
|
|
|
|
;; except the scratch buffer.
|
|
|
|
|
(not (string= (buffer-name) "*scratch*")))
|
2008-01-31 16:08:29 +00:00
|
|
|
|
;; Otherwise, turn on whitespace mode.
|
|
|
|
|
(whitespace-turn-on)))))
|
2008-01-17 12:46:55 +00:00
|
|
|
|
|
2008-07-24 04:12:27 +00:00
|
|
|
|
|
|
|
|
|
;;;###autoload
|
|
|
|
|
(define-minor-mode global-whitespace-newline-mode
|
Fix minor mode docstrings for the new meaning of a nil ARG.
* abbrev.el (abbrev-mode):
* allout.el (allout-mode):
* autoinsert.el (auto-insert-mode):
* autoarg.el (autoarg-mode, autoarg-kp-mode):
* autorevert.el (auto-revert-mode, auto-revert-tail-mode)
(global-auto-revert-mode):
* battery.el (display-battery-mode):
* composite.el (global-auto-composition-mode)
(auto-composition-mode):
* delsel.el (delete-selection-mode):
* desktop.el (desktop-save-mode):
* dired-x.el (dired-omit-mode):
* dirtrack.el (dirtrack-mode):
* doc-view.el (doc-view-minor-mode):
* double.el (double-mode):
* electric.el (electric-indent-mode, electric-pair-mode):
* emacs-lock.el (emacs-lock-mode):
* epa-hook.el (auto-encryption-mode):
* follow.el (follow-mode):
* font-core.el (font-lock-mode):
* frame.el (auto-raise-mode, auto-lower-mode, blink-cursor-mode):
* help.el (temp-buffer-resize-mode):
* hilit-chg.el (highlight-changes-mode)
(highlight-changes-visible-mode):
* hi-lock.el (hi-lock-mode):
* hl-line.el (hl-line-mode, global-hl-line-mode):
* icomplete.el (icomplete-mode):
* ido.el (ido-everywhere):
* image-file.el (auto-image-file-mode):
* image-mode.el (image-minor-mode):
* iswitchb.el (iswitchb-mode):
* jka-cmpr-hook.el (auto-compression-mode):
* linum.el (linum-mode):
* longlines.el (longlines-mode):
* master.el (master-mode):
* mb-depth.el (minibuffer-depth-indicate-mode):
* menu-bar.el (menu-bar-mode):
* minibuf-eldef.el (minibuffer-electric-default-mode):
* mouse-sel.el (mouse-sel-mode):
* msb.el (msb-mode):
* mwheel.el (mouse-wheel-mode):
* outline.el (outline-minor-mode):
* paren.el (show-paren-mode):
* recentf.el (recentf-mode):
* reveal.el (reveal-mode, global-reveal-mode):
* rfn-eshadow.el (file-name-shadow-mode):
* ruler-mode.el (ruler-mode):
* savehist.el (savehist-mode):
* scroll-all.el (scroll-all-mode):
* scroll-bar.el (scroll-bar-mode):
* server.el (server-mode):
* shell.el (shell-dirtrack-mode):
* simple.el (auto-fill-mode, transient-mark-mode)
(visual-line-mode, overwrite-mode, binary-overwrite-mode)
(line-number-mode, column-number-mode, size-indication-mode)
(auto-save-mode, normal-erase-is-backspace-mode, visible-mode):
* strokes.el (strokes-mode):
* time.el (display-time-mode):
* t-mouse.el (gpm-mouse-mode):
* tool-bar.el (tool-bar-mode):
* tooltip.el (tooltip-mode):
* type-break.el (type-break-mode-line-message-mode)
(type-break-query-mode):
* view.el (view-mode):
* whitespace.el (whitespace-mode, whitespace-newline-mode)
(global-whitespace-mode, global-whitespace-newline-mode):
* xt-mouse.el (xterm-mouse-mode): Doc fix.
* emacs-lisp/easy-mmode.el (define-globalized-minor-mode): Fix
autogenerated docstring.
2011-10-19 12:54:24 +00:00
|
|
|
|
"Toggle global newline visualization (Global Whitespace Newline mode).
|
|
|
|
|
With a prefix argument ARG, enable Global Whitespace Newline mode
|
|
|
|
|
if ARG is positive, and disable it otherwise. If called from
|
|
|
|
|
Lisp, enable it if ARG is omitted or nil.
|
2008-07-24 04:12:27 +00:00
|
|
|
|
|
2008-08-06 03:35:04 +00:00
|
|
|
|
Use `global-whitespace-newline-mode' only for NEWLINE
|
|
|
|
|
visualization exclusively. For other visualizations, including
|
|
|
|
|
NEWLINE visualization together with (HARD) SPACEs and/or TABs,
|
2010-01-18 04:39:40 +00:00
|
|
|
|
please use `global-whitespace-mode'.
|
2008-08-06 03:35:04 +00:00
|
|
|
|
|
|
|
|
|
See also `whitespace-newline' and `whitespace-display-mappings'."
|
2008-07-24 04:12:27 +00:00
|
|
|
|
:lighter " NL"
|
|
|
|
|
:init-value nil
|
|
|
|
|
:global t
|
|
|
|
|
:group 'whitespace
|
|
|
|
|
(let ((whitespace-style '(newline-mark newline)))
|
2011-01-15 20:03:38 +00:00
|
|
|
|
(global-whitespace-mode (if global-whitespace-newline-mode
|
|
|
|
|
1 -1))
|
2008-07-24 04:12:27 +00:00
|
|
|
|
;; sync states (running a batch job)
|
|
|
|
|
(setq global-whitespace-newline-mode global-whitespace-mode)))
|
|
|
|
|
|
2008-01-17 12:46:55 +00:00
|
|
|
|
|
|
|
|
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
|
|
|
;;;; User commands - Toggle
|
|
|
|
|
|
|
|
|
|
|
2008-04-26 11:38:50 +00:00
|
|
|
|
(defconst whitespace-style-value-list
|
2010-08-25 02:27:58 +00:00
|
|
|
|
'(face
|
|
|
|
|
tabs
|
2008-01-17 12:46:55 +00:00
|
|
|
|
spaces
|
|
|
|
|
trailing
|
|
|
|
|
lines
|
2008-01-26 01:47:21 +00:00
|
|
|
|
lines-tail
|
2008-01-17 12:46:55 +00:00
|
|
|
|
newline
|
2008-01-25 14:09:57 +00:00
|
|
|
|
empty
|
2008-04-16 03:41:17 +00:00
|
|
|
|
indentation
|
|
|
|
|
indentation::tab
|
|
|
|
|
indentation::space
|
2008-01-25 14:09:57 +00:00
|
|
|
|
space-after-tab
|
2008-04-16 03:41:17 +00:00
|
|
|
|
space-after-tab::tab
|
|
|
|
|
space-after-tab::space
|
|
|
|
|
space-before-tab
|
|
|
|
|
space-before-tab::tab
|
|
|
|
|
space-before-tab::space
|
2008-04-26 11:38:50 +00:00
|
|
|
|
help-newline ; value used by `whitespace-insert-option-mark'
|
|
|
|
|
tab-mark
|
2008-04-16 03:41:17 +00:00
|
|
|
|
space-mark
|
|
|
|
|
newline-mark
|
2008-01-17 12:46:55 +00:00
|
|
|
|
)
|
2008-04-26 11:38:50 +00:00
|
|
|
|
"List of valid `whitespace-style' values.")
|
2008-01-17 12:46:55 +00:00
|
|
|
|
|
|
|
|
|
|
2008-01-31 16:08:29 +00:00
|
|
|
|
(defconst whitespace-toggle-option-alist
|
2010-08-25 02:27:58 +00:00
|
|
|
|
'((?f . face)
|
|
|
|
|
(?t . tabs)
|
2008-04-16 03:41:17 +00:00
|
|
|
|
(?s . spaces)
|
|
|
|
|
(?r . trailing)
|
|
|
|
|
(?l . lines)
|
|
|
|
|
(?L . lines-tail)
|
|
|
|
|
(?n . newline)
|
|
|
|
|
(?e . empty)
|
|
|
|
|
(?\C-i . indentation)
|
|
|
|
|
(?I . indentation::tab)
|
|
|
|
|
(?i . indentation::space)
|
|
|
|
|
(?\C-a . space-after-tab)
|
|
|
|
|
(?A . space-after-tab::tab)
|
|
|
|
|
(?a . space-after-tab::space)
|
|
|
|
|
(?\C-b . space-before-tab)
|
|
|
|
|
(?B . space-before-tab::tab)
|
|
|
|
|
(?b . space-before-tab::space)
|
|
|
|
|
(?T . tab-mark)
|
|
|
|
|
(?S . space-mark)
|
|
|
|
|
(?N . newline-mark)
|
2008-04-26 11:38:50 +00:00
|
|
|
|
(?x . whitespace-style)
|
2008-01-17 12:46:55 +00:00
|
|
|
|
)
|
|
|
|
|
"Alist of toggle options.
|
|
|
|
|
|
|
|
|
|
Each element has the form:
|
|
|
|
|
|
|
|
|
|
(CHAR . SYMBOL)
|
|
|
|
|
|
|
|
|
|
Where:
|
|
|
|
|
|
|
|
|
|
CHAR is a char which the user will have to type.
|
|
|
|
|
|
|
|
|
|
SYMBOL is a valid symbol associated with CHAR.
|
2008-04-26 11:38:50 +00:00
|
|
|
|
See `whitespace-style-value-list'.")
|
2008-01-17 12:46:55 +00:00
|
|
|
|
|
|
|
|
|
|
2008-04-26 11:38:50 +00:00
|
|
|
|
(defvar whitespace-active-style nil
|
|
|
|
|
"Used to save locally `whitespace-style' value.")
|
2008-01-17 12:46:55 +00:00
|
|
|
|
|
2008-04-16 03:41:17 +00:00
|
|
|
|
(defvar whitespace-indent-tabs-mode indent-tabs-mode
|
|
|
|
|
"Used to save locally `indent-tabs-mode' value.")
|
|
|
|
|
|
|
|
|
|
(defvar whitespace-tab-width tab-width
|
|
|
|
|
"Used to save locally `tab-width' value.")
|
2008-01-17 12:46:55 +00:00
|
|
|
|
|
2009-09-25 02:23:51 +00:00
|
|
|
|
(defvar whitespace-point (point)
|
|
|
|
|
"Used to save locally current point value.
|
|
|
|
|
Used by `whitespace-trailing-regexp' function (which see).")
|
|
|
|
|
|
|
|
|
|
(defvar whitespace-font-lock-refontify nil
|
|
|
|
|
"Used to save locally the font-lock refontify state.
|
|
|
|
|
Used by `whitespace-post-command-hook' function (which see).")
|
|
|
|
|
|
2010-08-21 04:43:04 +00:00
|
|
|
|
(defvar whitespace-bob-marker nil
|
|
|
|
|
"Used to save locally the bob marker value.
|
|
|
|
|
Used by `whitespace-post-command-hook' function (which see).")
|
|
|
|
|
|
|
|
|
|
(defvar whitespace-eob-marker nil
|
|
|
|
|
"Used to save locally the eob marker value.
|
|
|
|
|
Used by `whitespace-post-command-hook' function (which see).")
|
|
|
|
|
|
|
|
|
|
(defvar whitespace-buffer-changed nil
|
|
|
|
|
"Used to indicate locally if buffer changed.
|
|
|
|
|
Used by `whitespace-post-command-hook' and `whitespace-buffer-changed'
|
|
|
|
|
functions (which see).")
|
|
|
|
|
|
2008-01-17 12:46:55 +00:00
|
|
|
|
|
|
|
|
|
;;;###autoload
|
2008-01-31 16:08:29 +00:00
|
|
|
|
(defun whitespace-toggle-options (arg)
|
|
|
|
|
"Toggle local `whitespace-mode' options.
|
2008-01-17 12:46:55 +00:00
|
|
|
|
|
2008-01-31 16:08:29 +00:00
|
|
|
|
If local whitespace-mode is off, toggle the option given by ARG
|
|
|
|
|
and turn on local whitespace-mode.
|
2008-01-17 12:46:55 +00:00
|
|
|
|
|
2008-01-31 16:08:29 +00:00
|
|
|
|
If local whitespace-mode is on, toggle the option given by ARG
|
|
|
|
|
and restart local whitespace-mode.
|
2008-01-17 12:46:55 +00:00
|
|
|
|
|
|
|
|
|
Interactively, it reads one of the following chars:
|
|
|
|
|
|
|
|
|
|
CHAR MEANING
|
2008-04-16 03:41:17 +00:00
|
|
|
|
(VIA FACES)
|
2010-08-25 02:27:58 +00:00
|
|
|
|
f toggle face visualization
|
2008-01-21 12:45:58 +00:00
|
|
|
|
t toggle TAB visualization
|
|
|
|
|
s toggle SPACE and HARD SPACE visualization
|
|
|
|
|
r toggle trailing blanks visualization
|
|
|
|
|
l toggle \"long lines\" visualization
|
2008-01-26 01:47:21 +00:00
|
|
|
|
L toggle \"long lines\" tail visualization
|
2008-01-21 12:45:58 +00:00
|
|
|
|
n toggle NEWLINE visualization
|
2008-01-25 14:09:57 +00:00
|
|
|
|
e toggle empty line at bob and/or eob visualization
|
2008-04-16 03:41:17 +00:00
|
|
|
|
C-i toggle indentation SPACEs visualization (via `indent-tabs-mode')
|
|
|
|
|
I toggle indentation SPACEs visualization
|
|
|
|
|
i toggle indentation TABs visualization
|
|
|
|
|
C-a toggle SPACEs after TAB visualization (via `indent-tabs-mode')
|
|
|
|
|
A toggle SPACEs after TAB: SPACEs visualization
|
|
|
|
|
a toggle SPACEs after TAB: TABs visualization
|
|
|
|
|
C-b toggle SPACEs before TAB visualization (via `indent-tabs-mode')
|
|
|
|
|
B toggle SPACEs before TAB: SPACEs visualization
|
|
|
|
|
b toggle SPACEs before TAB: TABs visualization
|
|
|
|
|
|
|
|
|
|
(VIA DISPLAY TABLE)
|
|
|
|
|
T toggle TAB visualization
|
|
|
|
|
S toggle SPACEs before TAB visualization
|
|
|
|
|
N toggle NEWLINE visualization
|
|
|
|
|
|
2008-04-26 11:38:50 +00:00
|
|
|
|
x restore `whitespace-style' value
|
2008-01-17 12:46:55 +00:00
|
|
|
|
? display brief help
|
|
|
|
|
|
2008-01-21 12:45:58 +00:00
|
|
|
|
Non-interactively, ARG should be a symbol or a list of symbols.
|
2008-01-17 12:46:55 +00:00
|
|
|
|
The valid symbols are:
|
|
|
|
|
|
2010-08-25 02:27:58 +00:00
|
|
|
|
face toggle face visualization
|
2008-01-21 12:45:58 +00:00
|
|
|
|
tabs toggle TAB visualization
|
|
|
|
|
spaces toggle SPACE and HARD SPACE visualization
|
|
|
|
|
trailing toggle trailing blanks visualization
|
|
|
|
|
lines toggle \"long lines\" visualization
|
2008-01-26 01:47:21 +00:00
|
|
|
|
lines-tail toggle \"long lines\" tail visualization
|
2008-01-21 12:45:58 +00:00
|
|
|
|
newline toggle NEWLINE visualization
|
2008-01-25 14:09:57 +00:00
|
|
|
|
empty toggle empty line at bob and/or eob visualization
|
2008-04-16 03:41:17 +00:00
|
|
|
|
indentation toggle indentation SPACEs visualization
|
|
|
|
|
indentation::tab toggle indentation SPACEs visualization
|
|
|
|
|
indentation::space toggle indentation TABs visualization
|
|
|
|
|
space-after-tab toggle SPACEs after TAB visualization
|
|
|
|
|
space-after-tab::tab toggle SPACEs after TAB: SPACEs visualization
|
|
|
|
|
space-after-tab::space toggle SPACEs after TAB: TABs visualization
|
|
|
|
|
space-before-tab toggle SPACEs before TAB visualization
|
|
|
|
|
space-before-tab::tab toggle SPACEs before TAB: SPACEs visualization
|
|
|
|
|
space-before-tab::space toggle SPACEs before TAB: TABs visualization
|
|
|
|
|
|
|
|
|
|
tab-mark toggle TAB visualization
|
|
|
|
|
space-mark toggle SPACEs before TAB visualization
|
|
|
|
|
newline-mark toggle NEWLINE visualization
|
|
|
|
|
|
2008-04-26 11:38:50 +00:00
|
|
|
|
whitespace-style restore `whitespace-style' value
|
2008-04-16 03:41:17 +00:00
|
|
|
|
|
2008-04-26 11:38:50 +00:00
|
|
|
|
See `whitespace-style' and `indent-tabs-mode' for documentation."
|
2008-01-31 16:08:29 +00:00
|
|
|
|
(interactive (whitespace-interactive-char t))
|
2008-04-26 11:38:50 +00:00
|
|
|
|
(let ((whitespace-style
|
|
|
|
|
(whitespace-toggle-list t arg whitespace-active-style)))
|
2008-01-31 16:08:29 +00:00
|
|
|
|
(whitespace-mode 0)
|
|
|
|
|
(whitespace-mode 1)))
|
2008-01-17 12:46:55 +00:00
|
|
|
|
|
|
|
|
|
|
2008-04-26 11:38:50 +00:00
|
|
|
|
(defvar whitespace-toggle-style nil
|
|
|
|
|
"Used to toggle the global `whitespace-style' value.")
|
2008-01-17 12:46:55 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;;###autoload
|
2008-01-31 16:08:29 +00:00
|
|
|
|
(defun global-whitespace-toggle-options (arg)
|
|
|
|
|
"Toggle global `whitespace-mode' options.
|
2008-01-17 12:46:55 +00:00
|
|
|
|
|
2008-01-31 16:08:29 +00:00
|
|
|
|
If global whitespace-mode is off, toggle the option given by ARG
|
|
|
|
|
and turn on global whitespace-mode.
|
2008-01-17 12:46:55 +00:00
|
|
|
|
|
2008-01-31 16:08:29 +00:00
|
|
|
|
If global whitespace-mode is on, toggle the option given by ARG
|
|
|
|
|
and restart global whitespace-mode.
|
2008-01-17 12:46:55 +00:00
|
|
|
|
|
(whitespace): Set :version tag to 23.1.
(whitespace-turn-off, whitespace-toggle-options): Fix typos.
(whitespace-style, whitespace-chars, whitespace-space, whitespace-hspace,
whitespace-tab, whitespace-newline, whitespace-trailing, whitespace-line,
whitespace-space-before-tab, whitespace-indentation, whitespace-empty,
whitespace-space-after-tab, whitespace-hspace-regexp, whitespace-space-regexp,
whitespace-tab-regexp, whitespace-trailing-regexp,
whitespace-space-before-tab-regexp, whitespace-indentation-regexp,
whitespace-empty-at-bob-regexp, whitespace-empty-at-eob-regexp,
whitespace-space-after-tab-regexp, whitespace-line-column,
whitespace-display-mappings, global-whitespace-toggle-options,
whitespace-cleanup, whitespace-cleanup-region, whitespace-interactive-char):
Doc fixes.
2008-02-01 14:44:44 +00:00
|
|
|
|
Interactively, it accepts one of the following chars:
|
2008-01-17 12:46:55 +00:00
|
|
|
|
|
|
|
|
|
CHAR MEANING
|
2008-04-16 03:41:17 +00:00
|
|
|
|
(VIA FACES)
|
2010-08-25 02:27:58 +00:00
|
|
|
|
f toggle face visualization
|
2008-01-21 12:45:58 +00:00
|
|
|
|
t toggle TAB visualization
|
|
|
|
|
s toggle SPACE and HARD SPACE visualization
|
|
|
|
|
r toggle trailing blanks visualization
|
|
|
|
|
l toggle \"long lines\" visualization
|
2008-01-26 01:47:21 +00:00
|
|
|
|
L toggle \"long lines\" tail visualization
|
2008-01-21 12:45:58 +00:00
|
|
|
|
n toggle NEWLINE visualization
|
2008-01-25 14:09:57 +00:00
|
|
|
|
e toggle empty line at bob and/or eob visualization
|
2008-04-16 03:41:17 +00:00
|
|
|
|
C-i toggle indentation SPACEs visualization (via `indent-tabs-mode')
|
|
|
|
|
I toggle indentation SPACEs visualization
|
|
|
|
|
i toggle indentation TABs visualization
|
|
|
|
|
C-a toggle SPACEs after TAB visualization (via `indent-tabs-mode')
|
|
|
|
|
A toggle SPACEs after TAB: SPACEs visualization
|
|
|
|
|
a toggle SPACEs after TAB: TABs visualization
|
|
|
|
|
C-b toggle SPACEs before TAB visualization (via `indent-tabs-mode')
|
|
|
|
|
B toggle SPACEs before TAB: SPACEs visualization
|
|
|
|
|
b toggle SPACEs before TAB: TABs visualization
|
|
|
|
|
|
|
|
|
|
(VIA DISPLAY TABLE)
|
|
|
|
|
T toggle TAB visualization
|
|
|
|
|
S toggle SPACEs before TAB visualization
|
|
|
|
|
N toggle NEWLINE visualization
|
|
|
|
|
|
2008-04-26 11:38:50 +00:00
|
|
|
|
x restore `whitespace-style' value
|
2008-01-17 12:46:55 +00:00
|
|
|
|
? display brief help
|
|
|
|
|
|
2008-01-21 12:45:58 +00:00
|
|
|
|
Non-interactively, ARG should be a symbol or a list of symbols.
|
2008-01-17 12:46:55 +00:00
|
|
|
|
The valid symbols are:
|
|
|
|
|
|
2010-08-25 02:27:58 +00:00
|
|
|
|
face toggle face visualization
|
2008-01-21 12:45:58 +00:00
|
|
|
|
tabs toggle TAB visualization
|
|
|
|
|
spaces toggle SPACE and HARD SPACE visualization
|
|
|
|
|
trailing toggle trailing blanks visualization
|
|
|
|
|
lines toggle \"long lines\" visualization
|
2008-01-26 01:47:21 +00:00
|
|
|
|
lines-tail toggle \"long lines\" tail visualization
|
2008-01-21 12:45:58 +00:00
|
|
|
|
newline toggle NEWLINE visualization
|
2008-01-25 14:09:57 +00:00
|
|
|
|
empty toggle empty line at bob and/or eob visualization
|
2008-04-16 03:41:17 +00:00
|
|
|
|
indentation toggle indentation SPACEs visualization
|
|
|
|
|
indentation::tab toggle indentation SPACEs visualization
|
|
|
|
|
indentation::space toggle indentation TABs visualization
|
|
|
|
|
space-after-tab toggle SPACEs after TAB visualization
|
|
|
|
|
space-after-tab::tab toggle SPACEs after TAB: SPACEs visualization
|
|
|
|
|
space-after-tab::space toggle SPACEs after TAB: TABs visualization
|
|
|
|
|
space-before-tab toggle SPACEs before TAB visualization
|
|
|
|
|
space-before-tab::tab toggle SPACEs before TAB: SPACEs visualization
|
|
|
|
|
space-before-tab::space toggle SPACEs before TAB: TABs visualization
|
|
|
|
|
|
|
|
|
|
tab-mark toggle TAB visualization
|
|
|
|
|
space-mark toggle SPACEs before TAB visualization
|
|
|
|
|
newline-mark toggle NEWLINE visualization
|
|
|
|
|
|
2008-04-26 11:38:50 +00:00
|
|
|
|
whitespace-style restore `whitespace-style' value
|
2008-04-16 03:41:17 +00:00
|
|
|
|
|
2008-04-26 11:38:50 +00:00
|
|
|
|
See `whitespace-style' and `indent-tabs-mode' for documentation."
|
2008-01-31 16:08:29 +00:00
|
|
|
|
(interactive (whitespace-interactive-char nil))
|
2008-04-26 11:38:50 +00:00
|
|
|
|
(let ((whitespace-style
|
|
|
|
|
(whitespace-toggle-list nil arg whitespace-toggle-style)))
|
|
|
|
|
(setq whitespace-toggle-style whitespace-style)
|
2008-01-31 16:08:29 +00:00
|
|
|
|
(global-whitespace-mode 0)
|
|
|
|
|
(global-whitespace-mode 1)))
|
2008-01-17 12:46:55 +00:00
|
|
|
|
|
2008-01-25 14:09:57 +00:00
|
|
|
|
|
|
|
|
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
|
|
|
;;;; User commands - Cleanup
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;;###autoload
|
2008-01-31 16:08:29 +00:00
|
|
|
|
(defun whitespace-cleanup ()
|
2008-01-25 14:09:57 +00:00
|
|
|
|
"Cleanup some blank problems in all buffer or at region.
|
|
|
|
|
|
|
|
|
|
It usually applies to the whole buffer, but in transient mark
|
|
|
|
|
mode when the mark is active, it applies to the region. It also
|
2008-10-18 15:51:35 +00:00
|
|
|
|
applies to the region when it is not in transient mark mode, the
|
2008-04-16 03:41:17 +00:00
|
|
|
|
mark is active and \\[universal-argument] was pressed just before
|
|
|
|
|
calling `whitespace-cleanup' interactively.
|
2008-01-25 14:09:57 +00:00
|
|
|
|
|
2008-01-31 16:08:29 +00:00
|
|
|
|
See also `whitespace-cleanup-region'.
|
2008-01-25 14:09:57 +00:00
|
|
|
|
|
(whitespace): Set :version tag to 23.1.
(whitespace-turn-off, whitespace-toggle-options): Fix typos.
(whitespace-style, whitespace-chars, whitespace-space, whitespace-hspace,
whitespace-tab, whitespace-newline, whitespace-trailing, whitespace-line,
whitespace-space-before-tab, whitespace-indentation, whitespace-empty,
whitespace-space-after-tab, whitespace-hspace-regexp, whitespace-space-regexp,
whitespace-tab-regexp, whitespace-trailing-regexp,
whitespace-space-before-tab-regexp, whitespace-indentation-regexp,
whitespace-empty-at-bob-regexp, whitespace-empty-at-eob-regexp,
whitespace-space-after-tab-regexp, whitespace-line-column,
whitespace-display-mappings, global-whitespace-toggle-options,
whitespace-cleanup, whitespace-cleanup-region, whitespace-interactive-char):
Doc fixes.
2008-02-01 14:44:44 +00:00
|
|
|
|
The problems cleaned up are:
|
2008-01-25 14:09:57 +00:00
|
|
|
|
|
|
|
|
|
1. empty lines at beginning of buffer.
|
|
|
|
|
2. empty lines at end of buffer.
|
2008-04-26 11:38:50 +00:00
|
|
|
|
If `whitespace-style' includes the value `empty', remove all
|
2008-01-31 16:08:29 +00:00
|
|
|
|
empty lines at beginning and/or end of buffer.
|
2008-01-25 14:09:57 +00:00
|
|
|
|
|
|
|
|
|
3. 8 or more SPACEs at beginning of line.
|
2008-04-26 11:38:50 +00:00
|
|
|
|
If `whitespace-style' includes the value `indentation':
|
2008-04-16 03:41:17 +00:00
|
|
|
|
replace 8 or more SPACEs at beginning of line by TABs, if
|
|
|
|
|
`indent-tabs-mode' is non-nil; otherwise, replace TABs by
|
|
|
|
|
SPACEs.
|
2008-04-26 11:38:50 +00:00
|
|
|
|
If `whitespace-style' includes the value `indentation::tab',
|
|
|
|
|
replace 8 or more SPACEs at beginning of line by TABs.
|
|
|
|
|
If `whitespace-style' includes the value `indentation::space',
|
|
|
|
|
replace TABs by SPACEs.
|
2008-01-25 14:09:57 +00:00
|
|
|
|
|
|
|
|
|
4. SPACEs before TAB.
|
2008-04-26 11:38:50 +00:00
|
|
|
|
If `whitespace-style' includes the value `space-before-tab':
|
2008-04-16 03:41:17 +00:00
|
|
|
|
replace SPACEs by TABs, if `indent-tabs-mode' is non-nil;
|
|
|
|
|
otherwise, replace TABs by SPACEs.
|
2008-04-26 11:38:50 +00:00
|
|
|
|
If `whitespace-style' includes the value
|
2008-04-16 03:41:17 +00:00
|
|
|
|
`space-before-tab::tab', replace SPACEs by TABs.
|
2008-04-26 11:38:50 +00:00
|
|
|
|
If `whitespace-style' includes the value
|
2008-04-16 03:41:17 +00:00
|
|
|
|
`space-before-tab::space', replace TABs by SPACEs.
|
2008-01-25 14:09:57 +00:00
|
|
|
|
|
|
|
|
|
5. SPACEs or TABs at end of line.
|
2008-04-26 11:38:50 +00:00
|
|
|
|
If `whitespace-style' includes the value `trailing', remove
|
2008-04-16 03:41:17 +00:00
|
|
|
|
all SPACEs or TABs at end of line.
|
2008-01-25 14:09:57 +00:00
|
|
|
|
|
|
|
|
|
6. 8 or more SPACEs after TAB.
|
2008-04-26 11:38:50 +00:00
|
|
|
|
If `whitespace-style' includes the value `space-after-tab':
|
2008-04-16 03:41:17 +00:00
|
|
|
|
replace SPACEs by TABs, if `indent-tabs-mode' is non-nil;
|
|
|
|
|
otherwise, replace TABs by SPACEs.
|
2008-04-26 11:38:50 +00:00
|
|
|
|
If `whitespace-style' includes the value
|
2008-04-16 03:41:17 +00:00
|
|
|
|
`space-after-tab::tab', replace SPACEs by TABs.
|
2008-04-26 11:38:50 +00:00
|
|
|
|
If `whitespace-style' includes the value
|
2008-04-16 03:41:17 +00:00
|
|
|
|
`space-after-tab::space', replace TABs by SPACEs.
|
|
|
|
|
|
2008-04-26 11:38:50 +00:00
|
|
|
|
See `whitespace-style', `indent-tabs-mode' and `tab-width' for
|
|
|
|
|
documentation."
|
2008-09-06 00:19:31 +00:00
|
|
|
|
(interactive "@")
|
|
|
|
|
(cond
|
|
|
|
|
;; read-only buffer
|
|
|
|
|
(buffer-read-only
|
|
|
|
|
(whitespace-warn-read-only "cleanup"))
|
|
|
|
|
;; region active
|
|
|
|
|
((and (or transient-mark-mode
|
|
|
|
|
current-prefix-arg)
|
|
|
|
|
mark-active)
|
|
|
|
|
;; PROBLEMs 1 and 2 are not handled in region
|
|
|
|
|
;; PROBLEM 3: 8 or more SPACEs at bol
|
|
|
|
|
;; PROBLEM 4: SPACEs before TAB
|
|
|
|
|
;; PROBLEM 5: SPACEs or TABs at eol
|
|
|
|
|
;; PROBLEM 6: 8 or more SPACEs after TAB
|
|
|
|
|
(whitespace-cleanup-region (region-beginning) (region-end)))
|
|
|
|
|
;; whole buffer
|
|
|
|
|
(t
|
2008-01-25 14:09:57 +00:00
|
|
|
|
(save-excursion
|
2011-05-04 01:02:09 +00:00
|
|
|
|
(save-match-data ;FIXME: Why?
|
2008-04-16 03:41:17 +00:00
|
|
|
|
;; PROBLEM 1: empty lines at bob
|
|
|
|
|
;; PROBLEM 2: empty lines at eob
|
|
|
|
|
;; ACTION: remove all empty lines at bob and/or eob
|
2008-04-26 11:38:50 +00:00
|
|
|
|
(when (memq 'empty whitespace-style)
|
2008-01-26 01:47:21 +00:00
|
|
|
|
(let (overwrite-mode) ; enforce no overwrite
|
|
|
|
|
(goto-char (point-min))
|
2012-05-29 11:51:19 +00:00
|
|
|
|
(when (looking-at whitespace-empty-at-bob-regexp)
|
2008-01-26 01:47:21 +00:00
|
|
|
|
(delete-region (match-beginning 1) (match-end 1)))
|
2008-01-31 16:08:29 +00:00
|
|
|
|
(when (re-search-forward
|
2010-08-21 04:43:04 +00:00
|
|
|
|
(concat whitespace-empty-at-eob-regexp "\\'") nil t)
|
2008-01-26 01:47:21 +00:00
|
|
|
|
(delete-region (match-beginning 1) (match-end 1)))))))
|
2008-04-16 03:41:17 +00:00
|
|
|
|
;; PROBLEM 3: 8 or more SPACEs at bol
|
|
|
|
|
;; PROBLEM 4: SPACEs before TAB
|
|
|
|
|
;; PROBLEM 5: SPACEs or TABs at eol
|
|
|
|
|
;; PROBLEM 6: 8 or more SPACEs after TAB
|
2008-09-06 00:19:31 +00:00
|
|
|
|
(whitespace-cleanup-region (point-min) (point-max)))))
|
2008-01-25 14:09:57 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;;###autoload
|
2008-01-31 16:08:29 +00:00
|
|
|
|
(defun whitespace-cleanup-region (start end)
|
2008-01-25 14:09:57 +00:00
|
|
|
|
"Cleanup some blank problems at region.
|
|
|
|
|
|
(whitespace): Set :version tag to 23.1.
(whitespace-turn-off, whitespace-toggle-options): Fix typos.
(whitespace-style, whitespace-chars, whitespace-space, whitespace-hspace,
whitespace-tab, whitespace-newline, whitespace-trailing, whitespace-line,
whitespace-space-before-tab, whitespace-indentation, whitespace-empty,
whitespace-space-after-tab, whitespace-hspace-regexp, whitespace-space-regexp,
whitespace-tab-regexp, whitespace-trailing-regexp,
whitespace-space-before-tab-regexp, whitespace-indentation-regexp,
whitespace-empty-at-bob-regexp, whitespace-empty-at-eob-regexp,
whitespace-space-after-tab-regexp, whitespace-line-column,
whitespace-display-mappings, global-whitespace-toggle-options,
whitespace-cleanup, whitespace-cleanup-region, whitespace-interactive-char):
Doc fixes.
2008-02-01 14:44:44 +00:00
|
|
|
|
The problems cleaned up are:
|
2008-01-25 14:09:57 +00:00
|
|
|
|
|
|
|
|
|
1. 8 or more SPACEs at beginning of line.
|
2008-04-26 11:38:50 +00:00
|
|
|
|
If `whitespace-style' includes the value `indentation':
|
2008-04-16 03:41:17 +00:00
|
|
|
|
replace 8 or more SPACEs at beginning of line by TABs, if
|
|
|
|
|
`indent-tabs-mode' is non-nil; otherwise, replace TABs by
|
|
|
|
|
SPACEs.
|
2008-04-26 11:38:50 +00:00
|
|
|
|
If `whitespace-style' includes the value `indentation::tab',
|
|
|
|
|
replace 8 or more SPACEs at beginning of line by TABs.
|
|
|
|
|
If `whitespace-style' includes the value `indentation::space',
|
|
|
|
|
replace TABs by SPACEs.
|
2008-01-25 14:09:57 +00:00
|
|
|
|
|
|
|
|
|
2. SPACEs before TAB.
|
2008-04-26 11:38:50 +00:00
|
|
|
|
If `whitespace-style' includes the value `space-before-tab':
|
2008-04-16 03:41:17 +00:00
|
|
|
|
replace SPACEs by TABs, if `indent-tabs-mode' is non-nil;
|
|
|
|
|
otherwise, replace TABs by SPACEs.
|
2008-04-26 11:38:50 +00:00
|
|
|
|
If `whitespace-style' includes the value
|
2008-04-16 03:41:17 +00:00
|
|
|
|
`space-before-tab::tab', replace SPACEs by TABs.
|
2008-04-26 11:38:50 +00:00
|
|
|
|
If `whitespace-style' includes the value
|
2008-04-16 03:41:17 +00:00
|
|
|
|
`space-before-tab::space', replace TABs by SPACEs.
|
2008-01-25 14:09:57 +00:00
|
|
|
|
|
|
|
|
|
3. SPACEs or TABs at end of line.
|
2008-04-26 11:38:50 +00:00
|
|
|
|
If `whitespace-style' includes the value `trailing', remove
|
2008-04-16 03:41:17 +00:00
|
|
|
|
all SPACEs or TABs at end of line.
|
2008-01-25 14:09:57 +00:00
|
|
|
|
|
|
|
|
|
4. 8 or more SPACEs after TAB.
|
2008-04-26 11:38:50 +00:00
|
|
|
|
If `whitespace-style' includes the value `space-after-tab':
|
2008-04-16 03:41:17 +00:00
|
|
|
|
replace SPACEs by TABs, if `indent-tabs-mode' is non-nil;
|
|
|
|
|
otherwise, replace TABs by SPACEs.
|
2008-04-26 11:38:50 +00:00
|
|
|
|
If `whitespace-style' includes the value
|
2008-04-16 03:41:17 +00:00
|
|
|
|
`space-after-tab::tab', replace SPACEs by TABs.
|
2008-04-26 11:38:50 +00:00
|
|
|
|
If `whitespace-style' includes the value
|
2008-04-16 03:41:17 +00:00
|
|
|
|
`space-after-tab::space', replace TABs by SPACEs.
|
|
|
|
|
|
2008-04-26 11:38:50 +00:00
|
|
|
|
See `whitespace-style', `indent-tabs-mode' and `tab-width' for
|
|
|
|
|
documentation."
|
2008-09-06 00:19:31 +00:00
|
|
|
|
(interactive "@r")
|
|
|
|
|
(if buffer-read-only
|
|
|
|
|
;; read-only buffer
|
|
|
|
|
(whitespace-warn-read-only "cleanup region")
|
|
|
|
|
;; non-read-only buffer
|
|
|
|
|
(let ((rstart (min start end))
|
|
|
|
|
(rend (copy-marker (max start end)))
|
|
|
|
|
(indent-tabs-mode whitespace-indent-tabs-mode)
|
|
|
|
|
(tab-width whitespace-tab-width)
|
|
|
|
|
overwrite-mode ; enforce no overwrite
|
|
|
|
|
tmp)
|
|
|
|
|
(save-excursion
|
2011-05-04 01:02:09 +00:00
|
|
|
|
(save-match-data ;FIXME: Why?
|
2008-09-06 00:19:31 +00:00
|
|
|
|
;; PROBLEM 1: 8 or more SPACEs at bol
|
|
|
|
|
(cond
|
|
|
|
|
;; ACTION: replace 8 or more SPACEs at bol by TABs, if
|
|
|
|
|
;; `indent-tabs-mode' is non-nil; otherwise, replace TABs
|
|
|
|
|
;; by SPACEs.
|
|
|
|
|
((memq 'indentation whitespace-style)
|
|
|
|
|
(let ((regexp (whitespace-indentation-regexp)))
|
|
|
|
|
(goto-char rstart)
|
|
|
|
|
(while (re-search-forward regexp rend t)
|
|
|
|
|
(setq tmp (current-indentation))
|
|
|
|
|
(goto-char (match-beginning 0))
|
|
|
|
|
(delete-horizontal-space)
|
|
|
|
|
(unless (eolp)
|
|
|
|
|
(indent-to tmp)))))
|
|
|
|
|
;; ACTION: replace 8 or more SPACEs at bol by TABs.
|
|
|
|
|
((memq 'indentation::tab whitespace-style)
|
|
|
|
|
(whitespace-replace-action
|
|
|
|
|
'tabify rstart rend
|
|
|
|
|
(whitespace-indentation-regexp 'tab) 0))
|
|
|
|
|
;; ACTION: replace TABs by SPACEs.
|
|
|
|
|
((memq 'indentation::space whitespace-style)
|
|
|
|
|
(whitespace-replace-action
|
|
|
|
|
'untabify rstart rend
|
|
|
|
|
(whitespace-indentation-regexp 'space) 0)))
|
|
|
|
|
;; PROBLEM 3: SPACEs or TABs at eol
|
|
|
|
|
;; ACTION: remove all SPACEs or TABs at eol
|
|
|
|
|
(when (memq 'trailing whitespace-style)
|
|
|
|
|
(whitespace-replace-action
|
|
|
|
|
'delete-region rstart rend
|
|
|
|
|
whitespace-trailing-regexp 1))
|
|
|
|
|
;; PROBLEM 4: 8 or more SPACEs after TAB
|
|
|
|
|
(cond
|
|
|
|
|
;; ACTION: replace 8 or more SPACEs by TABs, if
|
|
|
|
|
;; `indent-tabs-mode' is non-nil; otherwise, replace TABs
|
|
|
|
|
;; by SPACEs.
|
|
|
|
|
((memq 'space-after-tab whitespace-style)
|
|
|
|
|
(whitespace-replace-action
|
|
|
|
|
(if whitespace-indent-tabs-mode 'tabify 'untabify)
|
|
|
|
|
rstart rend (whitespace-space-after-tab-regexp) 1))
|
|
|
|
|
;; ACTION: replace 8 or more SPACEs by TABs.
|
|
|
|
|
((memq 'space-after-tab::tab whitespace-style)
|
|
|
|
|
(whitespace-replace-action
|
|
|
|
|
'tabify rstart rend
|
|
|
|
|
(whitespace-space-after-tab-regexp 'tab) 1))
|
|
|
|
|
;; ACTION: replace TABs by SPACEs.
|
|
|
|
|
((memq 'space-after-tab::space whitespace-style)
|
|
|
|
|
(whitespace-replace-action
|
|
|
|
|
'untabify rstart rend
|
|
|
|
|
(whitespace-space-after-tab-regexp 'space) 1)))
|
|
|
|
|
;; PROBLEM 2: SPACEs before TAB
|
|
|
|
|
(cond
|
|
|
|
|
;; ACTION: replace SPACEs before TAB by TABs, if
|
|
|
|
|
;; `indent-tabs-mode' is non-nil; otherwise, replace TABs
|
|
|
|
|
;; by SPACEs.
|
|
|
|
|
((memq 'space-before-tab whitespace-style)
|
|
|
|
|
(whitespace-replace-action
|
|
|
|
|
(if whitespace-indent-tabs-mode 'tabify 'untabify)
|
|
|
|
|
rstart rend whitespace-space-before-tab-regexp
|
2010-12-08 19:25:11 +00:00
|
|
|
|
(if whitespace-indent-tabs-mode 0 2)))
|
2008-09-06 00:19:31 +00:00
|
|
|
|
;; ACTION: replace SPACEs before TAB by TABs.
|
|
|
|
|
((memq 'space-before-tab::tab whitespace-style)
|
|
|
|
|
(whitespace-replace-action
|
|
|
|
|
'tabify rstart rend
|
2010-12-08 19:25:11 +00:00
|
|
|
|
whitespace-space-before-tab-regexp 0))
|
2008-09-06 00:19:31 +00:00
|
|
|
|
;; ACTION: replace TABs by SPACEs.
|
|
|
|
|
((memq 'space-before-tab::space whitespace-style)
|
|
|
|
|
(whitespace-replace-action
|
|
|
|
|
'untabify rstart rend
|
|
|
|
|
whitespace-space-before-tab-regexp 2)))))
|
|
|
|
|
(set-marker rend nil)))) ; point marker to nowhere
|
2008-01-25 14:09:57 +00:00
|
|
|
|
|
2008-01-26 01:47:21 +00:00
|
|
|
|
|
2008-04-16 03:41:17 +00:00
|
|
|
|
(defun whitespace-replace-action (action rstart rend regexp index)
|
|
|
|
|
"Do ACTION in the string matched by REGEXP between RSTART and REND.
|
|
|
|
|
|
|
|
|
|
INDEX is the level group matched by REGEXP and used by ACTION.
|
|
|
|
|
|
|
|
|
|
See also `tab-width'."
|
2008-01-26 01:47:21 +00:00
|
|
|
|
(goto-char rstart)
|
|
|
|
|
(while (re-search-forward regexp rend t)
|
2008-04-16 03:41:17 +00:00
|
|
|
|
(goto-char (match-end index))
|
|
|
|
|
(funcall action (match-beginning index) (match-end index))))
|
2008-01-26 01:47:21 +00:00
|
|
|
|
|
2008-01-31 16:08:29 +00:00
|
|
|
|
|
|
|
|
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
2008-03-01 19:00:24 +00:00
|
|
|
|
;;;; User command - report
|
|
|
|
|
|
|
|
|
|
|
2008-04-16 03:41:17 +00:00
|
|
|
|
(defun whitespace-regexp (regexp &optional kind)
|
|
|
|
|
"Return REGEXP depending on `whitespace-indent-tabs-mode'."
|
|
|
|
|
(cond
|
|
|
|
|
((or (eq kind 'tab)
|
|
|
|
|
whitespace-indent-tabs-mode)
|
|
|
|
|
(format (car regexp) whitespace-tab-width))
|
|
|
|
|
((or (eq kind 'space)
|
|
|
|
|
(not whitespace-indent-tabs-mode))
|
|
|
|
|
(cdr regexp))))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
(defun whitespace-indentation-regexp (&optional kind)
|
|
|
|
|
"Return the indentation regexp depending on `whitespace-indent-tabs-mode'."
|
|
|
|
|
(whitespace-regexp whitespace-indentation-regexp kind))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
(defun whitespace-space-after-tab-regexp (&optional kind)
|
|
|
|
|
"Return the space-after-tab regexp depending on `whitespace-indent-tabs-mode'."
|
|
|
|
|
(whitespace-regexp whitespace-space-after-tab-regexp kind))
|
|
|
|
|
|
|
|
|
|
|
2008-03-01 19:00:24 +00:00
|
|
|
|
(defconst whitespace-report-list
|
|
|
|
|
(list
|
2008-04-16 03:41:17 +00:00
|
|
|
|
(cons 'empty whitespace-empty-at-bob-regexp)
|
|
|
|
|
(cons 'empty whitespace-empty-at-eob-regexp)
|
2008-04-27 11:50:47 +00:00
|
|
|
|
(cons 'trailing whitespace-trailing-regexp)
|
2008-04-16 03:41:17 +00:00
|
|
|
|
(cons 'indentation nil)
|
|
|
|
|
(cons 'indentation::tab nil)
|
|
|
|
|
(cons 'indentation::space nil)
|
|
|
|
|
(cons 'space-before-tab whitespace-space-before-tab-regexp)
|
|
|
|
|
(cons 'space-before-tab::tab whitespace-space-before-tab-regexp)
|
|
|
|
|
(cons 'space-before-tab::space whitespace-space-before-tab-regexp)
|
|
|
|
|
(cons 'space-after-tab nil)
|
|
|
|
|
(cons 'space-after-tab::tab nil)
|
|
|
|
|
(cons 'space-after-tab::space nil)
|
2008-03-01 19:00:24 +00:00
|
|
|
|
)
|
|
|
|
|
"List of whitespace bogus symbol and corresponding regexp.")
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
(defconst whitespace-report-text
|
2008-04-16 03:41:17 +00:00
|
|
|
|
'( ;; `indent-tabs-mode' has non-nil value
|
|
|
|
|
"\
|
|
|
|
|
Whitespace Report
|
|
|
|
|
|
|
|
|
|
Current Setting Whitespace Problem
|
|
|
|
|
|
|
|
|
|
empty [] [] empty lines at beginning of buffer
|
|
|
|
|
empty [] [] empty lines at end of buffer
|
|
|
|
|
trailing [] [] SPACEs or TABs at end of line
|
|
|
|
|
indentation [] [] 8 or more SPACEs at beginning of line
|
|
|
|
|
indentation::tab [] [] 8 or more SPACEs at beginning of line
|
|
|
|
|
indentation::space [] [] TABs at beginning of line
|
|
|
|
|
space-before-tab [] [] SPACEs before TAB
|
|
|
|
|
space-before-tab::tab [] [] SPACEs before TAB: SPACEs
|
|
|
|
|
space-before-tab::space [] [] SPACEs before TAB: TABs
|
|
|
|
|
space-after-tab [] [] 8 or more SPACEs after TAB
|
|
|
|
|
space-after-tab::tab [] [] 8 or more SPACEs after TAB: SPACEs
|
|
|
|
|
space-after-tab::space [] [] 8 or more SPACEs after TAB: TABs
|
|
|
|
|
|
|
|
|
|
indent-tabs-mode =
|
|
|
|
|
tab-width = \n\n"
|
|
|
|
|
. ;; `indent-tabs-mode' has nil value
|
|
|
|
|
"\
|
|
|
|
|
Whitespace Report
|
|
|
|
|
|
|
|
|
|
Current Setting Whitespace Problem
|
|
|
|
|
|
|
|
|
|
empty [] [] empty lines at beginning of buffer
|
|
|
|
|
empty [] [] empty lines at end of buffer
|
|
|
|
|
trailing [] [] SPACEs or TABs at end of line
|
|
|
|
|
indentation [] [] TABs at beginning of line
|
|
|
|
|
indentation::tab [] [] 8 or more SPACEs at beginning of line
|
|
|
|
|
indentation::space [] [] TABs at beginning of line
|
|
|
|
|
space-before-tab [] [] SPACEs before TAB
|
|
|
|
|
space-before-tab::tab [] [] SPACEs before TAB: SPACEs
|
|
|
|
|
space-before-tab::space [] [] SPACEs before TAB: TABs
|
|
|
|
|
space-after-tab [] [] 8 or more SPACEs after TAB
|
|
|
|
|
space-after-tab::tab [] [] 8 or more SPACEs after TAB: SPACEs
|
|
|
|
|
space-after-tab::space [] [] 8 or more SPACEs after TAB: TABs
|
|
|
|
|
|
|
|
|
|
indent-tabs-mode =
|
|
|
|
|
tab-width = \n\n")
|
|
|
|
|
"Text for whitespace bogus report.
|
|
|
|
|
|
|
|
|
|
It is a cons of strings, where the car part is used when
|
|
|
|
|
`indent-tabs-mode' is non-nil, and the cdr part is used when
|
|
|
|
|
`indent-tabs-mode' is nil.")
|
2008-03-01 19:00:24 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
(defconst whitespace-report-buffer-name "*Whitespace Report*"
|
|
|
|
|
"The buffer name for whitespace bogus report.")
|
2008-01-31 16:08:29 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;;###autoload
|
2008-03-01 19:00:24 +00:00
|
|
|
|
(defun whitespace-report (&optional force report-if-bogus)
|
|
|
|
|
"Report some whitespace problems in buffer.
|
2008-01-31 16:08:29 +00:00
|
|
|
|
|
2008-03-01 19:00:24 +00:00
|
|
|
|
Return nil if there is no whitespace problem; otherwise, return
|
|
|
|
|
non-nil.
|
2008-01-31 16:08:29 +00:00
|
|
|
|
|
2008-04-16 03:41:17 +00:00
|
|
|
|
If FORCE is non-nil or \\[universal-argument] was pressed just
|
|
|
|
|
before calling `whitespace-report' interactively, it forces
|
2008-04-26 11:38:50 +00:00
|
|
|
|
`whitespace-style' to have:
|
2008-01-31 16:08:29 +00:00
|
|
|
|
|
2008-03-01 19:00:24 +00:00
|
|
|
|
empty
|
2008-04-16 03:41:17 +00:00
|
|
|
|
trailing
|
2008-01-31 16:08:29 +00:00
|
|
|
|
indentation
|
|
|
|
|
space-before-tab
|
2008-03-01 19:00:24 +00:00
|
|
|
|
space-after-tab
|
|
|
|
|
|
|
|
|
|
If REPORT-IF-BOGUS is non-nil, it reports only when there are any
|
|
|
|
|
whitespace problems in buffer.
|
|
|
|
|
|
|
|
|
|
Report if some of the following whitespace problems exist:
|
|
|
|
|
|
2008-04-16 03:41:17 +00:00
|
|
|
|
* If `indent-tabs-mode' is non-nil:
|
2008-03-01 19:00:24 +00:00
|
|
|
|
empty 1. empty lines at beginning of buffer.
|
|
|
|
|
empty 2. empty lines at end of buffer.
|
2008-04-16 03:41:17 +00:00
|
|
|
|
trailing 3. SPACEs or TABs at end of line.
|
|
|
|
|
indentation 4. 8 or more SPACEs at beginning of line.
|
|
|
|
|
space-before-tab 5. SPACEs before TAB.
|
2008-03-01 19:00:24 +00:00
|
|
|
|
space-after-tab 6. 8 or more SPACEs after TAB.
|
|
|
|
|
|
2008-04-16 03:41:17 +00:00
|
|
|
|
* If `indent-tabs-mode' is nil:
|
|
|
|
|
empty 1. empty lines at beginning of buffer.
|
|
|
|
|
empty 2. empty lines at end of buffer.
|
|
|
|
|
trailing 3. SPACEs or TABs at end of line.
|
|
|
|
|
indentation 4. TABS at beginning of line.
|
|
|
|
|
space-before-tab 5. SPACEs before TAB.
|
|
|
|
|
space-after-tab 6. 8 or more SPACEs after TAB.
|
|
|
|
|
|
2008-04-26 11:38:50 +00:00
|
|
|
|
See `whitespace-style' for documentation.
|
2008-03-01 19:00:24 +00:00
|
|
|
|
See also `whitespace-cleanup' and `whitespace-cleanup-region' for
|
|
|
|
|
cleaning up these problems."
|
|
|
|
|
(interactive (list current-prefix-arg))
|
|
|
|
|
(whitespace-report-region (point-min) (point-max)
|
|
|
|
|
force report-if-bogus))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;;###autoload
|
|
|
|
|
(defun whitespace-report-region (start end &optional force report-if-bogus)
|
|
|
|
|
"Report some whitespace problems in a region.
|
|
|
|
|
|
|
|
|
|
Return nil if there is no whitespace problem; otherwise, return
|
|
|
|
|
non-nil.
|
|
|
|
|
|
2008-04-16 03:41:17 +00:00
|
|
|
|
If FORCE is non-nil or \\[universal-argument] was pressed just
|
|
|
|
|
before calling `whitespace-report-region' interactively, it
|
2008-04-26 11:38:50 +00:00
|
|
|
|
forces `whitespace-style' to have:
|
2008-03-01 19:00:24 +00:00
|
|
|
|
|
2008-01-31 16:08:29 +00:00
|
|
|
|
empty
|
2008-03-01 19:00:24 +00:00
|
|
|
|
indentation
|
|
|
|
|
space-before-tab
|
|
|
|
|
trailing
|
2008-01-31 16:08:29 +00:00
|
|
|
|
space-after-tab
|
|
|
|
|
|
2008-03-01 19:00:24 +00:00
|
|
|
|
If REPORT-IF-BOGUS is non-nil, it reports only when there are any
|
|
|
|
|
whitespace problems in buffer.
|
|
|
|
|
|
|
|
|
|
Report if some of the following whitespace problems exist:
|
2008-01-31 16:08:29 +00:00
|
|
|
|
|
2008-04-16 03:41:17 +00:00
|
|
|
|
* If `indent-tabs-mode' is non-nil:
|
|
|
|
|
empty 1. empty lines at beginning of buffer.
|
|
|
|
|
empty 2. empty lines at end of buffer.
|
|
|
|
|
trailing 3. SPACEs or TABs at end of line.
|
|
|
|
|
indentation 4. 8 or more SPACEs at beginning of line.
|
|
|
|
|
space-before-tab 5. SPACEs before TAB.
|
|
|
|
|
space-after-tab 6. 8 or more SPACEs after TAB.
|
|
|
|
|
|
|
|
|
|
* If `indent-tabs-mode' is nil:
|
2008-01-31 16:08:29 +00:00
|
|
|
|
empty 1. empty lines at beginning of buffer.
|
|
|
|
|
empty 2. empty lines at end of buffer.
|
2008-04-16 03:41:17 +00:00
|
|
|
|
trailing 3. SPACEs or TABs at end of line.
|
|
|
|
|
indentation 4. TABS at beginning of line.
|
|
|
|
|
space-before-tab 5. SPACEs before TAB.
|
2008-01-31 16:08:29 +00:00
|
|
|
|
space-after-tab 6. 8 or more SPACEs after TAB.
|
|
|
|
|
|
2008-04-26 11:38:50 +00:00
|
|
|
|
See `whitespace-style' for documentation.
|
2008-01-31 16:08:29 +00:00
|
|
|
|
See also `whitespace-cleanup' and `whitespace-cleanup-region' for
|
|
|
|
|
cleaning up these problems."
|
2008-03-01 19:00:24 +00:00
|
|
|
|
(interactive "r")
|
|
|
|
|
(setq force (or current-prefix-arg force))
|
|
|
|
|
(save-excursion
|
2011-05-04 01:02:09 +00:00
|
|
|
|
(save-match-data ;FIXME: Why?
|
2008-04-16 03:41:17 +00:00
|
|
|
|
(let* ((has-bogus nil)
|
|
|
|
|
(rstart (min start end))
|
|
|
|
|
(rend (max start end))
|
|
|
|
|
(bogus-list
|
|
|
|
|
(mapcar
|
|
|
|
|
#'(lambda (option)
|
|
|
|
|
(when force
|
2008-04-26 11:38:50 +00:00
|
|
|
|
(add-to-list 'whitespace-style (car option)))
|
2008-04-16 03:41:17 +00:00
|
|
|
|
(goto-char rstart)
|
|
|
|
|
(let ((regexp
|
|
|
|
|
(cond
|
|
|
|
|
((eq (car option) 'indentation)
|
|
|
|
|
(whitespace-indentation-regexp))
|
|
|
|
|
((eq (car option) 'indentation::tab)
|
|
|
|
|
(whitespace-indentation-regexp 'tab))
|
|
|
|
|
((eq (car option) 'indentation::space)
|
|
|
|
|
(whitespace-indentation-regexp 'space))
|
|
|
|
|
((eq (car option) 'space-after-tab)
|
|
|
|
|
(whitespace-space-after-tab-regexp))
|
|
|
|
|
((eq (car option) 'space-after-tab::tab)
|
|
|
|
|
(whitespace-space-after-tab-regexp 'tab))
|
|
|
|
|
((eq (car option) 'space-after-tab::space)
|
|
|
|
|
(whitespace-space-after-tab-regexp 'space))
|
|
|
|
|
(t
|
|
|
|
|
(cdr option)))))
|
|
|
|
|
(and (re-search-forward regexp rend t)
|
|
|
|
|
(setq has-bogus t))))
|
|
|
|
|
whitespace-report-list)))
|
2008-03-01 19:00:24 +00:00
|
|
|
|
(when (if report-if-bogus has-bogus t)
|
2008-04-16 03:41:17 +00:00
|
|
|
|
(whitespace-kill-buffer whitespace-report-buffer-name)
|
|
|
|
|
;; `whitespace-indent-tabs-mode' is local to current buffer
|
2008-04-18 02:01:46 +00:00
|
|
|
|
;; `whitespace-tab-width' is local to current buffer
|
|
|
|
|
(let ((ws-indent-tabs-mode whitespace-indent-tabs-mode)
|
|
|
|
|
(ws-tab-width whitespace-tab-width))
|
2008-04-16 03:41:17 +00:00
|
|
|
|
(with-current-buffer (get-buffer-create
|
|
|
|
|
whitespace-report-buffer-name)
|
|
|
|
|
(erase-buffer)
|
|
|
|
|
(insert (if ws-indent-tabs-mode
|
|
|
|
|
(car whitespace-report-text)
|
|
|
|
|
(cdr whitespace-report-text)))
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
(forward-line 3)
|
|
|
|
|
(dolist (option whitespace-report-list)
|
|
|
|
|
(forward-line 1)
|
|
|
|
|
(whitespace-mark-x
|
2008-04-26 11:38:50 +00:00
|
|
|
|
27 (memq (car option) whitespace-style))
|
2008-04-16 03:41:17 +00:00
|
|
|
|
(whitespace-mark-x 7 (car bogus-list))
|
|
|
|
|
(setq bogus-list (cdr bogus-list)))
|
2008-03-01 19:00:24 +00:00
|
|
|
|
(forward-line 1)
|
2008-04-16 03:41:17 +00:00
|
|
|
|
(whitespace-insert-value ws-indent-tabs-mode)
|
2008-04-18 02:01:46 +00:00
|
|
|
|
(whitespace-insert-value ws-tab-width)
|
2008-04-16 03:41:17 +00:00
|
|
|
|
(when has-bogus
|
|
|
|
|
(goto-char (point-max))
|
|
|
|
|
(insert " Type `M-x whitespace-cleanup'"
|
|
|
|
|
" to cleanup the buffer.\n\n"
|
|
|
|
|
" Type `M-x whitespace-cleanup-region'"
|
|
|
|
|
" to cleanup a region.\n\n"))
|
|
|
|
|
(whitespace-display-window (current-buffer)))))
|
2008-03-01 19:00:24 +00:00
|
|
|
|
has-bogus))))
|
2008-01-31 16:08:29 +00:00
|
|
|
|
|
2008-01-17 12:46:55 +00:00
|
|
|
|
|
|
|
|
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
|
|
|
;;;; Internal functions
|
|
|
|
|
|
|
|
|
|
|
2008-01-31 16:08:29 +00:00
|
|
|
|
(defvar whitespace-font-lock-mode nil
|
2008-01-17 12:46:55 +00:00
|
|
|
|
"Used to remember whether a buffer had font lock mode on or not.")
|
|
|
|
|
|
2008-01-31 16:08:29 +00:00
|
|
|
|
(defvar whitespace-font-lock nil
|
2008-01-17 12:46:55 +00:00
|
|
|
|
"Used to remember whether a buffer initially had font lock on or not.")
|
|
|
|
|
|
2008-01-31 16:08:29 +00:00
|
|
|
|
(defvar whitespace-font-lock-keywords nil
|
2008-01-17 12:46:55 +00:00
|
|
|
|
"Used to save locally `font-lock-keywords' value.")
|
|
|
|
|
|
|
|
|
|
|
2008-01-31 16:08:29 +00:00
|
|
|
|
(defconst whitespace-help-text
|
2008-01-17 12:46:55 +00:00
|
|
|
|
"\
|
2010-08-25 02:27:58 +00:00
|
|
|
|
Whitespace Toggle Options | scroll up : SPC or > |
|
|
|
|
|
| scroll down: M-SPC or < |
|
|
|
|
|
FACES \\__________________________/
|
|
|
|
|
[] f - toggle face visualization
|
2008-04-16 03:41:17 +00:00
|
|
|
|
[] t - toggle TAB visualization
|
|
|
|
|
[] s - toggle SPACE and HARD SPACE visualization
|
|
|
|
|
[] r - toggle trailing blanks visualization
|
|
|
|
|
[] l - toggle \"long lines\" visualization
|
|
|
|
|
[] L - toggle \"long lines\" tail visualization
|
|
|
|
|
[] n - toggle NEWLINE visualization
|
|
|
|
|
[] e - toggle empty line at bob and/or eob visualization
|
|
|
|
|
[] C-i - toggle indentation SPACEs visualization (via `indent-tabs-mode')
|
|
|
|
|
[] I - toggle indentation SPACEs visualization
|
|
|
|
|
[] i - toggle indentation TABs visualization
|
|
|
|
|
[] C-a - toggle SPACEs after TAB visualization (via `indent-tabs-mode')
|
|
|
|
|
[] A - toggle SPACEs after TAB: SPACEs visualization
|
|
|
|
|
[] a - toggle SPACEs after TAB: TABs visualization
|
|
|
|
|
[] C-b - toggle SPACEs before TAB visualization (via `indent-tabs-mode')
|
|
|
|
|
[] B - toggle SPACEs before TAB: SPACEs visualization
|
|
|
|
|
[] b - toggle SPACEs before TAB: TABs visualization
|
|
|
|
|
|
|
|
|
|
DISPLAY TABLE
|
|
|
|
|
[] T - toggle TAB visualization
|
|
|
|
|
[] S - toggle SPACE and HARD SPACE visualization
|
|
|
|
|
[] N - toggle NEWLINE visualization
|
|
|
|
|
|
2008-04-26 11:38:50 +00:00
|
|
|
|
x - restore `whitespace-style' value
|
2008-01-17 12:46:55 +00:00
|
|
|
|
|
|
|
|
|
? - display this text\n\n"
|
2008-01-31 16:08:29 +00:00
|
|
|
|
"Text for whitespace toggle options.")
|
2008-01-17 12:46:55 +00:00
|
|
|
|
|
|
|
|
|
|
2008-01-31 16:08:29 +00:00
|
|
|
|
(defconst whitespace-help-buffer-name "*Whitespace Toggle Options*"
|
|
|
|
|
"The buffer name for whitespace toggle options.")
|
2008-01-17 12:46:55 +00:00
|
|
|
|
|
|
|
|
|
|
2008-04-16 03:41:17 +00:00
|
|
|
|
(defun whitespace-insert-value (value)
|
|
|
|
|
"Insert VALUE at column 20 of next line."
|
|
|
|
|
(forward-line 1)
|
|
|
|
|
(move-to-column 20 t)
|
|
|
|
|
(insert (format "%s" value)))
|
|
|
|
|
|
|
|
|
|
|
2008-03-01 19:00:24 +00:00
|
|
|
|
(defun whitespace-mark-x (nchars condition)
|
|
|
|
|
"Insert the mark ('X' or ' ') after NCHARS depending on CONDITION."
|
|
|
|
|
(forward-char nchars)
|
|
|
|
|
(insert (if condition "X" " ")))
|
|
|
|
|
|
|
|
|
|
|
2008-01-31 16:08:29 +00:00
|
|
|
|
(defun whitespace-insert-option-mark (the-list the-value)
|
2008-01-17 12:46:55 +00:00
|
|
|
|
"Insert the option mark ('X' or ' ') in toggle options buffer."
|
2008-04-26 11:38:50 +00:00
|
|
|
|
(goto-char (point-min))
|
2008-04-16 03:41:17 +00:00
|
|
|
|
(forward-line 2)
|
2008-01-17 12:46:55 +00:00
|
|
|
|
(dolist (sym the-list)
|
2008-04-26 11:38:50 +00:00
|
|
|
|
(if (eq sym 'help-newline)
|
|
|
|
|
(forward-line 2)
|
|
|
|
|
(forward-line 1)
|
|
|
|
|
(whitespace-mark-x 2 (memq sym the-value)))))
|
2008-01-17 12:46:55 +00:00
|
|
|
|
|
|
|
|
|
|
2008-04-26 11:38:50 +00:00
|
|
|
|
(defun whitespace-help-on (style)
|
2008-01-31 16:08:29 +00:00
|
|
|
|
"Display the whitespace toggle options."
|
|
|
|
|
(unless (get-buffer whitespace-help-buffer-name)
|
2008-01-17 12:46:55 +00:00
|
|
|
|
(delete-other-windows)
|
2008-01-31 16:08:29 +00:00
|
|
|
|
(let ((buffer (get-buffer-create whitespace-help-buffer-name)))
|
* x-dnd.el (x-dnd-maybe-call-test-function):
* window.el (split-window-vertically):
* whitespace.el (whitespace-help-on):
* vc-rcs.el (vc-rcs-consult-headers):
* userlock.el (ask-user-about-lock-help)
(ask-user-about-supersession-help):
* type-break.el (type-break-force-mode-line-update):
* time-stamp.el (time-stamp-conv-warn):
* terminal.el (te-set-output-log, te-more-break, te-filter)
(te-sentinel,terminal-emulator):
* term.el (make-term, term-exec, term-sentinel, term-read-input-ring)
(term-write-input-ring, term-check-source, term-start-output-log):
(term-display-buffer-line, term-dynamic-list-completions):
(term-ansi-make-term, serial-term):
* subr.el (selective-display):
* strokes.el (strokes-xpm-to-compressed-string, strokes-decode-buffer)
(strokes-encode-buffer, strokes-xpm-for-compressed-string):
* speedbar.el (speedbar-buffers-tail-notes, speedbar-buffers-item-info)
(speedbar-reconfigure-keymaps, speedbar-add-localized-speedbar-support)
(speedbar-remove-localized-speedbar-support)
(speedbar-set-mode-line-format, speedbar-create-tag-hierarchy)
(speedbar-update-special-contents, speedbar-buffer-buttons-engine)
(speedbar-buffers-line-directory):
* simple.el (shell-command-on-region, append-to-buffer)
(prepend-to-buffer):
* shadowfile.el (shadow-save-todo-file):
* scroll-bar.el (scroll-bar-set-window-start, scroll-bar-drag-1)
(scroll-bar-maybe-set-window-start):
* sb-image.el (speedbar-image-dump):
* saveplace.el (save-place-alist-to-file, save-places-to-alist)
(load-save-place-alist-from-file):
* ps-samp.el (ps-print-message-from-summary):
* ps-print.el (ps-flush-output, ps-insert-file, ps-get-boundingbox)
(ps-background-image, ps-begin-job, ps-do-despool):
* ps-bdf.el (bdf-find-file, bdf-read-font-info):
* printing.el (pr-interface, pr-ps-file-print, pr-find-buffer-visiting)
(pr-ps-message-from-summary, pr-lpr-message-from-summary):
(pr-call-process, pr-file-list, pr-interface-save):
* novice.el (disabled-command-function)
(enable-command, disable-command):
* mouse.el (mouse-buffer-menu-alist):
* mouse-copy.el (mouse-kill-preserving-secondary):
* macros.el (kbd-macro-query):
* ledit.el (ledit-go-to-lisp, ledit-go-to-liszt):
* informat.el (batch-info-validate):
* ido.el (ido-copy-current-word, ido-initiate-auto-merge):
* hippie-exp.el (try-expand-dabbrev-visible):
* help-mode.el (help-make-xrefs):
* help-fns.el (describe-variable):
* generic-x.el (bat-generic-mode-run-as-comint):
* finder.el (finder-mouse-select):
* find-dired.el (find-dired-sentinel):
* filesets.el (filesets-file-close):
* files.el (list-directory):
* faces.el (list-faces-display, describe-face):
* facemenu.el (list-colors-display):
* ezimage.el (ezimage-image-association-dump, ezimage-image-dump):
* epg.el (epg--process-filter, epg-cancel):
* epa.el (epa--marked-keys, epa--select-keys, epa-display-info)
(epa--read-signature-type):
* emerge.el (emerge-copy-as-kill-A, emerge-copy-as-kill-B)
(emerge-file-names):
* ehelp.el (electric-helpify):
* ediff.el (ediff-regions-wordwise, ediff-regions-linewise):
* ediff-vers.el (rcs-ediff-view-revision):
* ediff-util.el (ediff-setup):
* ediff-mult.el (ediff-append-custom-diff):
* ediff-diff.el (ediff-exec-process, ediff-process-sentinel)
(ediff-wordify):
* echistory.el (Electric-command-history-redo-expression):
* dos-w32.el (find-file-not-found-set-buffer-file-coding-system):
* disp-table.el (describe-display-table):
* dired.el (dired-find-buffer-nocreate):
* dired-aux.el (dired-rename-subdir, dired-dwim-target-directory):
* dabbrev.el (dabbrev--same-major-mode-p):
* chistory.el (list-command-history):
* apropos.el (apropos-documentation):
* allout.el (allout-obtain-passphrase):
(allout-copy-exposed-to-buffer):
(allout-verify-passphrase): Use with-current-buffer.
2009-11-13 22:19:45 +00:00
|
|
|
|
(with-current-buffer buffer
|
2008-01-17 12:46:55 +00:00
|
|
|
|
(erase-buffer)
|
2008-01-31 16:08:29 +00:00
|
|
|
|
(insert whitespace-help-text)
|
|
|
|
|
(whitespace-insert-option-mark
|
2008-04-26 11:38:50 +00:00
|
|
|
|
whitespace-style-value-list style)
|
2008-03-01 19:00:24 +00:00
|
|
|
|
(whitespace-display-window buffer)))))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
(defun whitespace-display-window (buffer)
|
|
|
|
|
"Display BUFFER in a new window."
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
(set-buffer-modified-p nil)
|
2010-08-25 02:27:58 +00:00
|
|
|
|
(when (< (window-height) (* 2 window-min-height))
|
|
|
|
|
(kill-buffer buffer)
|
|
|
|
|
(error "Window height is too small; \
|
2008-01-31 16:08:29 +00:00
|
|
|
|
can't split window to display whitespace toggle options"))
|
2010-08-25 02:27:58 +00:00
|
|
|
|
(let ((win (split-window)))
|
|
|
|
|
(set-window-buffer win buffer)
|
|
|
|
|
(shrink-window-if-larger-than-buffer win)))
|
2008-01-17 12:46:55 +00:00
|
|
|
|
|
|
|
|
|
|
2008-04-16 03:41:17 +00:00
|
|
|
|
(defun whitespace-kill-buffer (buffer-name)
|
|
|
|
|
"Kill buffer BUFFER-NAME and windows related with it."
|
|
|
|
|
(let ((buffer (get-buffer buffer-name)))
|
2008-01-17 12:46:55 +00:00
|
|
|
|
(when buffer
|
|
|
|
|
(delete-windows-on buffer)
|
|
|
|
|
(kill-buffer buffer))))
|
|
|
|
|
|
|
|
|
|
|
2008-04-16 03:41:17 +00:00
|
|
|
|
(defun whitespace-help-off ()
|
|
|
|
|
"Remove the buffer and window of the whitespace toggle options."
|
|
|
|
|
(whitespace-kill-buffer whitespace-help-buffer-name))
|
|
|
|
|
|
|
|
|
|
|
2010-08-25 02:27:58 +00:00
|
|
|
|
(defun whitespace-help-scroll (&optional up)
|
|
|
|
|
"Scroll help window, if it exists.
|
|
|
|
|
|
|
|
|
|
If UP is non-nil, scroll up; otherwise, scroll down."
|
2011-04-19 13:44:55 +00:00
|
|
|
|
(condition-case nil
|
2010-08-25 02:27:58 +00:00
|
|
|
|
(let ((buffer (get-buffer whitespace-help-buffer-name)))
|
|
|
|
|
(if buffer
|
|
|
|
|
(with-selected-window (get-buffer-window buffer)
|
|
|
|
|
(if up
|
|
|
|
|
(scroll-up 3)
|
|
|
|
|
(scroll-down 3)))
|
|
|
|
|
(ding)))
|
|
|
|
|
;; handler
|
|
|
|
|
((error)
|
|
|
|
|
;; just ignore error
|
|
|
|
|
)))
|
|
|
|
|
|
|
|
|
|
|
2008-01-31 16:08:29 +00:00
|
|
|
|
(defun whitespace-interactive-char (local-p)
|
2008-01-17 12:46:55 +00:00
|
|
|
|
"Interactive function to read a char and return a symbol.
|
|
|
|
|
|
|
|
|
|
If LOCAL-P is non-nil, it uses a local context; otherwise, it
|
|
|
|
|
uses a global context.
|
|
|
|
|
|
(whitespace): Set :version tag to 23.1.
(whitespace-turn-off, whitespace-toggle-options): Fix typos.
(whitespace-style, whitespace-chars, whitespace-space, whitespace-hspace,
whitespace-tab, whitespace-newline, whitespace-trailing, whitespace-line,
whitespace-space-before-tab, whitespace-indentation, whitespace-empty,
whitespace-space-after-tab, whitespace-hspace-regexp, whitespace-space-regexp,
whitespace-tab-regexp, whitespace-trailing-regexp,
whitespace-space-before-tab-regexp, whitespace-indentation-regexp,
whitespace-empty-at-bob-regexp, whitespace-empty-at-eob-regexp,
whitespace-space-after-tab-regexp, whitespace-line-column,
whitespace-display-mappings, global-whitespace-toggle-options,
whitespace-cleanup, whitespace-cleanup-region, whitespace-interactive-char):
Doc fixes.
2008-02-01 14:44:44 +00:00
|
|
|
|
It accepts one of the following chars:
|
2008-01-17 12:46:55 +00:00
|
|
|
|
|
|
|
|
|
CHAR MEANING
|
2008-04-16 03:41:17 +00:00
|
|
|
|
(VIA FACES)
|
2010-08-25 02:27:58 +00:00
|
|
|
|
f toggle face visualization
|
2008-01-21 12:45:58 +00:00
|
|
|
|
t toggle TAB visualization
|
|
|
|
|
s toggle SPACE and HARD SPACE visualization
|
|
|
|
|
r toggle trailing blanks visualization
|
|
|
|
|
l toggle \"long lines\" visualization
|
2008-01-26 01:47:21 +00:00
|
|
|
|
L toggle \"long lines\" tail visualization
|
2008-01-21 12:45:58 +00:00
|
|
|
|
n toggle NEWLINE visualization
|
2008-01-25 14:09:57 +00:00
|
|
|
|
e toggle empty line at bob and/or eob visualization
|
2008-04-16 03:41:17 +00:00
|
|
|
|
C-i toggle indentation SPACEs visualization (via `indent-tabs-mode')
|
|
|
|
|
I toggle indentation SPACEs visualization
|
|
|
|
|
i toggle indentation TABs visualization
|
|
|
|
|
C-a toggle SPACEs after TAB visualization (via `indent-tabs-mode')
|
|
|
|
|
A toggle SPACEs after TAB: SPACEs visualization
|
|
|
|
|
a toggle SPACEs after TAB: TABs visualization
|
|
|
|
|
C-b toggle SPACEs before TAB visualization (via `indent-tabs-mode')
|
|
|
|
|
B toggle SPACEs before TAB: SPACEs visualization
|
|
|
|
|
b toggle SPACEs before TAB: TABs visualization
|
|
|
|
|
|
|
|
|
|
(VIA DISPLAY TABLE)
|
|
|
|
|
T toggle TAB visualization
|
|
|
|
|
S toggle SPACE and HARD SPACE visualization
|
|
|
|
|
N toggle NEWLINE visualization
|
|
|
|
|
|
2008-04-26 11:38:50 +00:00
|
|
|
|
x restore `whitespace-style' value
|
2008-01-17 12:46:55 +00:00
|
|
|
|
? display brief help
|
|
|
|
|
|
2008-01-31 16:08:29 +00:00
|
|
|
|
See also `whitespace-toggle-option-alist'."
|
|
|
|
|
(let* ((is-off (not (if local-p
|
|
|
|
|
whitespace-mode
|
|
|
|
|
global-whitespace-mode)))
|
2008-04-26 11:38:50 +00:00
|
|
|
|
(style (cond (is-off whitespace-style) ; use default value
|
|
|
|
|
(local-p whitespace-active-style)
|
|
|
|
|
(t whitespace-toggle-style)))
|
2008-01-17 12:46:55 +00:00
|
|
|
|
(prompt
|
2008-01-31 16:08:29 +00:00
|
|
|
|
(format "Whitespace Toggle %s (type ? for further options)-"
|
2008-01-17 12:46:55 +00:00
|
|
|
|
(if local-p "Local" "Global")))
|
|
|
|
|
ch sym)
|
|
|
|
|
;; read a valid option and get the corresponding symbol
|
|
|
|
|
(save-window-excursion
|
|
|
|
|
(condition-case data
|
|
|
|
|
(progn
|
|
|
|
|
(while
|
|
|
|
|
;; while condition
|
|
|
|
|
(progn
|
|
|
|
|
(setq ch (read-char prompt))
|
|
|
|
|
(not
|
|
|
|
|
(setq sym
|
2008-01-31 16:08:29 +00:00
|
|
|
|
(cdr
|
|
|
|
|
(assq ch whitespace-toggle-option-alist)))))
|
2008-01-17 12:46:55 +00:00
|
|
|
|
;; while body
|
2010-08-25 02:27:58 +00:00
|
|
|
|
(cond
|
|
|
|
|
((eq ch ?\?) (whitespace-help-on style))
|
|
|
|
|
((eq ch ?\ ) (whitespace-help-scroll t))
|
|
|
|
|
((eq ch ?\M- ) (whitespace-help-scroll))
|
|
|
|
|
((eq ch ?>) (whitespace-help-scroll t))
|
|
|
|
|
((eq ch ?<) (whitespace-help-scroll))
|
|
|
|
|
(t (ding))))
|
2008-01-31 16:08:29 +00:00
|
|
|
|
(whitespace-help-off)
|
2008-01-17 12:46:55 +00:00
|
|
|
|
(message " ")) ; clean echo area
|
|
|
|
|
;; handler
|
|
|
|
|
((quit error)
|
2008-01-31 16:08:29 +00:00
|
|
|
|
(whitespace-help-off)
|
2008-01-17 12:46:55 +00:00
|
|
|
|
(error (error-message-string data)))))
|
2010-01-18 04:39:40 +00:00
|
|
|
|
(list sym))) ; return the appropriate symbol
|
2008-01-17 12:46:55 +00:00
|
|
|
|
|
|
|
|
|
|
2008-04-26 11:38:50 +00:00
|
|
|
|
(defun whitespace-toggle-list (local-p arg the-list)
|
2008-01-17 12:46:55 +00:00
|
|
|
|
"Toggle options in THE-LIST based on list ARG.
|
|
|
|
|
|
|
|
|
|
If LOCAL-P is non-nil, it uses a local context; otherwise, it
|
|
|
|
|
uses a global context.
|
|
|
|
|
|
|
|
|
|
ARG is a list of options to be toggled.
|
|
|
|
|
|
|
|
|
|
THE-LIST is a list of options. This list will be toggled and the
|
2008-04-26 11:38:50 +00:00
|
|
|
|
resultant list will be returned."
|
2008-01-31 16:08:29 +00:00
|
|
|
|
(unless (if local-p whitespace-mode global-whitespace-mode)
|
2008-04-26 11:38:50 +00:00
|
|
|
|
(setq the-list whitespace-style))
|
2008-01-17 12:46:55 +00:00
|
|
|
|
(setq the-list (copy-sequence the-list)) ; keep original list
|
|
|
|
|
(dolist (sym (if (listp arg) arg (list arg)))
|
|
|
|
|
(cond
|
2008-04-26 11:38:50 +00:00
|
|
|
|
;; ignore help value
|
|
|
|
|
((eq sym 'help-newline))
|
2008-01-17 12:46:55 +00:00
|
|
|
|
;; restore default values
|
2008-04-26 11:38:50 +00:00
|
|
|
|
((eq sym 'whitespace-style)
|
|
|
|
|
(setq the-list whitespace-style))
|
2008-01-17 12:46:55 +00:00
|
|
|
|
;; toggle valid values
|
2008-04-26 11:38:50 +00:00
|
|
|
|
((memq sym whitespace-style-value-list)
|
2008-01-17 12:46:55 +00:00
|
|
|
|
(setq the-list (if (memq sym the-list)
|
|
|
|
|
(delq sym the-list)
|
|
|
|
|
(cons sym the-list))))))
|
|
|
|
|
the-list)
|
|
|
|
|
|
2008-04-26 11:38:50 +00:00
|
|
|
|
|
2008-04-22 02:55:30 +00:00
|
|
|
|
(defvar whitespace-display-table nil
|
|
|
|
|
"Used to save a local display table.")
|
|
|
|
|
|
|
|
|
|
(defvar whitespace-display-table-was-local nil
|
|
|
|
|
"Used to remember whether a buffer initially had a local display table.")
|
2008-01-17 12:46:55 +00:00
|
|
|
|
|
2008-04-26 11:38:50 +00:00
|
|
|
|
|
2008-01-31 16:08:29 +00:00
|
|
|
|
(defun whitespace-turn-on ()
|
|
|
|
|
"Turn on whitespace visualization."
|
2008-04-16 03:41:17 +00:00
|
|
|
|
;; prepare local hooks
|
2008-10-02 00:49:49 +00:00
|
|
|
|
(add-hook 'write-file-functions 'whitespace-write-file-hook nil t)
|
2008-04-16 03:41:17 +00:00
|
|
|
|
;; create whitespace local buffer environment
|
|
|
|
|
(set (make-local-variable 'whitespace-font-lock-mode) nil)
|
|
|
|
|
(set (make-local-variable 'whitespace-font-lock) nil)
|
|
|
|
|
(set (make-local-variable 'whitespace-font-lock-keywords) nil)
|
|
|
|
|
(set (make-local-variable 'whitespace-display-table) nil)
|
|
|
|
|
(set (make-local-variable 'whitespace-display-table-was-local) nil)
|
2008-04-26 11:38:50 +00:00
|
|
|
|
(set (make-local-variable 'whitespace-active-style)
|
|
|
|
|
(if (listp whitespace-style)
|
|
|
|
|
whitespace-style
|
|
|
|
|
(list whitespace-style)))
|
2008-04-16 03:41:17 +00:00
|
|
|
|
(set (make-local-variable 'whitespace-indent-tabs-mode)
|
|
|
|
|
indent-tabs-mode)
|
|
|
|
|
(set (make-local-variable 'whitespace-tab-width)
|
|
|
|
|
tab-width)
|
|
|
|
|
;; turn on whitespace
|
2008-04-26 11:38:50 +00:00
|
|
|
|
(when whitespace-active-style
|
|
|
|
|
(whitespace-color-on)
|
2008-01-31 16:08:29 +00:00
|
|
|
|
(whitespace-display-char-on)))
|
2008-01-17 12:46:55 +00:00
|
|
|
|
|
|
|
|
|
|
2008-01-31 16:08:29 +00:00
|
|
|
|
(defun whitespace-turn-off ()
|
(whitespace): Set :version tag to 23.1.
(whitespace-turn-off, whitespace-toggle-options): Fix typos.
(whitespace-style, whitespace-chars, whitespace-space, whitespace-hspace,
whitespace-tab, whitespace-newline, whitespace-trailing, whitespace-line,
whitespace-space-before-tab, whitespace-indentation, whitespace-empty,
whitespace-space-after-tab, whitespace-hspace-regexp, whitespace-space-regexp,
whitespace-tab-regexp, whitespace-trailing-regexp,
whitespace-space-before-tab-regexp, whitespace-indentation-regexp,
whitespace-empty-at-bob-regexp, whitespace-empty-at-eob-regexp,
whitespace-space-after-tab-regexp, whitespace-line-column,
whitespace-display-mappings, global-whitespace-toggle-options,
whitespace-cleanup, whitespace-cleanup-region, whitespace-interactive-char):
Doc fixes.
2008-02-01 14:44:44 +00:00
|
|
|
|
"Turn off whitespace visualization."
|
2008-10-02 00:49:49 +00:00
|
|
|
|
(remove-hook 'write-file-functions 'whitespace-write-file-hook t)
|
2008-04-26 11:38:50 +00:00
|
|
|
|
(when whitespace-active-style
|
|
|
|
|
(whitespace-color-off)
|
2008-01-31 16:08:29 +00:00
|
|
|
|
(whitespace-display-char-off)))
|
2008-01-17 12:46:55 +00:00
|
|
|
|
|
|
|
|
|
|
2008-04-26 11:38:50 +00:00
|
|
|
|
(defun whitespace-style-face-p ()
|
|
|
|
|
"Return t if there is some visualization via face."
|
2010-08-25 02:27:58 +00:00
|
|
|
|
(and (memq 'face whitespace-active-style)
|
|
|
|
|
(or (memq 'tabs whitespace-active-style)
|
|
|
|
|
(memq 'spaces whitespace-active-style)
|
|
|
|
|
(memq 'trailing whitespace-active-style)
|
|
|
|
|
(memq 'lines whitespace-active-style)
|
|
|
|
|
(memq 'lines-tail whitespace-active-style)
|
|
|
|
|
(memq 'newline whitespace-active-style)
|
|
|
|
|
(memq 'empty whitespace-active-style)
|
|
|
|
|
(memq 'indentation whitespace-active-style)
|
|
|
|
|
(memq 'indentation::tab whitespace-active-style)
|
|
|
|
|
(memq 'indentation::space whitespace-active-style)
|
|
|
|
|
(memq 'space-after-tab whitespace-active-style)
|
|
|
|
|
(memq 'space-after-tab::tab whitespace-active-style)
|
|
|
|
|
(memq 'space-after-tab::space whitespace-active-style)
|
|
|
|
|
(memq 'space-before-tab whitespace-active-style)
|
|
|
|
|
(memq 'space-before-tab::tab whitespace-active-style)
|
|
|
|
|
(memq 'space-before-tab::space whitespace-active-style))))
|
2008-04-26 11:38:50 +00:00
|
|
|
|
|
|
|
|
|
|
2008-01-31 16:08:29 +00:00
|
|
|
|
(defun whitespace-color-on ()
|
2008-01-21 12:45:58 +00:00
|
|
|
|
"Turn on color visualization."
|
2008-04-26 11:38:50 +00:00
|
|
|
|
(when (whitespace-style-face-p)
|
2008-01-31 16:08:29 +00:00
|
|
|
|
(unless whitespace-font-lock
|
|
|
|
|
(setq whitespace-font-lock t
|
|
|
|
|
whitespace-font-lock-keywords
|
2008-01-17 12:46:55 +00:00
|
|
|
|
(copy-sequence font-lock-keywords)))
|
2009-09-25 02:23:51 +00:00
|
|
|
|
;; save current point and refontify when necessary
|
|
|
|
|
(set (make-local-variable 'whitespace-point)
|
|
|
|
|
(point))
|
|
|
|
|
(set (make-local-variable 'whitespace-font-lock-refontify)
|
2010-08-21 04:43:04 +00:00
|
|
|
|
0)
|
|
|
|
|
(set (make-local-variable 'whitespace-bob-marker)
|
|
|
|
|
(point-min-marker))
|
|
|
|
|
(set (make-local-variable 'whitespace-eob-marker)
|
|
|
|
|
(point-max-marker))
|
|
|
|
|
(set (make-local-variable 'whitespace-buffer-changed)
|
2009-09-25 02:23:51 +00:00
|
|
|
|
nil)
|
|
|
|
|
(add-hook 'post-command-hook #'whitespace-post-command-hook nil t)
|
2010-08-21 04:43:04 +00:00
|
|
|
|
(add-hook 'before-change-functions #'whitespace-buffer-changed nil t)
|
2008-01-17 12:46:55 +00:00
|
|
|
|
;; turn off font lock
|
2008-04-16 03:41:17 +00:00
|
|
|
|
(set (make-local-variable 'whitespace-font-lock-mode)
|
|
|
|
|
font-lock-mode)
|
2008-01-17 12:46:55 +00:00
|
|
|
|
(font-lock-mode 0)
|
2008-01-31 16:08:29 +00:00
|
|
|
|
;; add whitespace-mode color into font lock
|
2008-04-26 11:38:50 +00:00
|
|
|
|
(when (memq 'spaces whitespace-active-style)
|
2008-01-17 12:46:55 +00:00
|
|
|
|
(font-lock-add-keywords
|
|
|
|
|
nil
|
|
|
|
|
(list
|
|
|
|
|
;; Show SPACEs
|
2010-08-21 04:43:04 +00:00
|
|
|
|
(list whitespace-space-regexp 1 whitespace-space t)
|
2008-01-17 12:46:55 +00:00
|
|
|
|
;; Show HARD SPACEs
|
2008-01-31 16:08:29 +00:00
|
|
|
|
(list whitespace-hspace-regexp 1 whitespace-hspace t))
|
2008-01-17 12:46:55 +00:00
|
|
|
|
t))
|
2008-04-26 11:38:50 +00:00
|
|
|
|
(when (memq 'tabs whitespace-active-style)
|
2008-01-17 12:46:55 +00:00
|
|
|
|
(font-lock-add-keywords
|
|
|
|
|
nil
|
|
|
|
|
(list
|
|
|
|
|
;; Show TABs
|
2010-08-21 04:43:04 +00:00
|
|
|
|
(list whitespace-tab-regexp 1 whitespace-tab t))
|
2008-01-17 12:46:55 +00:00
|
|
|
|
t))
|
2008-04-26 11:38:50 +00:00
|
|
|
|
(when (memq 'trailing whitespace-active-style)
|
2008-01-17 12:46:55 +00:00
|
|
|
|
(font-lock-add-keywords
|
|
|
|
|
nil
|
|
|
|
|
(list
|
|
|
|
|
;; Show trailing blanks
|
2009-09-25 02:23:51 +00:00
|
|
|
|
(list #'whitespace-trailing-regexp 1 whitespace-trailing t))
|
2008-01-17 12:46:55 +00:00
|
|
|
|
t))
|
2008-04-26 11:38:50 +00:00
|
|
|
|
(when (or (memq 'lines whitespace-active-style)
|
|
|
|
|
(memq 'lines-tail whitespace-active-style))
|
2008-01-17 12:46:55 +00:00
|
|
|
|
(font-lock-add-keywords
|
|
|
|
|
nil
|
|
|
|
|
(list
|
|
|
|
|
;; Show "long" lines
|
2008-01-26 01:47:21 +00:00
|
|
|
|
(list
|
2010-08-25 02:27:58 +00:00
|
|
|
|
(let ((line-column (or whitespace-line-column fill-column)))
|
|
|
|
|
(format
|
|
|
|
|
"^\\([^\t\n]\\{%s\\}\\|[^\t\n]\\{0,%s\\}\t\\)\\{%d\\}%s\\(.+\\)$"
|
|
|
|
|
whitespace-tab-width
|
|
|
|
|
(1- whitespace-tab-width)
|
|
|
|
|
(/ line-column whitespace-tab-width)
|
|
|
|
|
(let ((rem (% line-column whitespace-tab-width)))
|
|
|
|
|
(if (zerop rem)
|
|
|
|
|
""
|
|
|
|
|
(format ".\\{%d\\}" rem)))))
|
2008-04-26 11:38:50 +00:00
|
|
|
|
(if (memq 'lines whitespace-active-style)
|
2008-01-26 01:47:21 +00:00
|
|
|
|
0 ; whole line
|
|
|
|
|
2) ; line tail
|
2008-01-31 16:08:29 +00:00
|
|
|
|
whitespace-line t))
|
2008-01-17 12:46:55 +00:00
|
|
|
|
t))
|
2008-04-16 03:41:17 +00:00
|
|
|
|
(cond
|
2008-04-26 11:38:50 +00:00
|
|
|
|
((memq 'space-before-tab whitespace-active-style)
|
2008-04-16 03:41:17 +00:00
|
|
|
|
(font-lock-add-keywords
|
|
|
|
|
nil
|
|
|
|
|
(list
|
|
|
|
|
;; Show SPACEs before TAB (indent-tabs-mode)
|
|
|
|
|
(list whitespace-space-before-tab-regexp
|
|
|
|
|
(if whitespace-indent-tabs-mode 1 2)
|
|
|
|
|
whitespace-space-before-tab t))
|
|
|
|
|
t))
|
2008-04-26 11:38:50 +00:00
|
|
|
|
((memq 'space-before-tab::tab whitespace-active-style)
|
2008-01-17 12:46:55 +00:00
|
|
|
|
(font-lock-add-keywords
|
|
|
|
|
nil
|
|
|
|
|
(list
|
2008-04-16 03:41:17 +00:00
|
|
|
|
;; Show SPACEs before TAB (SPACEs)
|
2008-01-31 16:08:29 +00:00
|
|
|
|
(list whitespace-space-before-tab-regexp
|
|
|
|
|
1 whitespace-space-before-tab t))
|
2008-01-17 12:46:55 +00:00
|
|
|
|
t))
|
2008-04-26 11:38:50 +00:00
|
|
|
|
((memq 'space-before-tab::space whitespace-active-style)
|
2008-01-25 14:09:57 +00:00
|
|
|
|
(font-lock-add-keywords
|
|
|
|
|
nil
|
|
|
|
|
(list
|
2008-04-16 03:41:17 +00:00
|
|
|
|
;; Show SPACEs before TAB (TABs)
|
|
|
|
|
(list whitespace-space-before-tab-regexp
|
|
|
|
|
2 whitespace-space-before-tab t))
|
|
|
|
|
t)))
|
|
|
|
|
(cond
|
2008-04-26 11:38:50 +00:00
|
|
|
|
((memq 'indentation whitespace-active-style)
|
2008-04-16 03:41:17 +00:00
|
|
|
|
(font-lock-add-keywords
|
|
|
|
|
nil
|
|
|
|
|
(list
|
|
|
|
|
;; Show indentation SPACEs (indent-tabs-mode)
|
|
|
|
|
(list (whitespace-indentation-regexp)
|
2008-01-31 16:08:29 +00:00
|
|
|
|
1 whitespace-indentation t))
|
2008-01-25 14:09:57 +00:00
|
|
|
|
t))
|
2008-04-26 11:38:50 +00:00
|
|
|
|
((memq 'indentation::tab whitespace-active-style)
|
2008-04-16 03:41:17 +00:00
|
|
|
|
(font-lock-add-keywords
|
|
|
|
|
nil
|
|
|
|
|
(list
|
|
|
|
|
;; Show indentation SPACEs (SPACEs)
|
|
|
|
|
(list (whitespace-indentation-regexp 'tab)
|
|
|
|
|
1 whitespace-indentation t))
|
|
|
|
|
t))
|
2008-04-26 11:38:50 +00:00
|
|
|
|
((memq 'indentation::space whitespace-active-style)
|
2008-04-16 03:41:17 +00:00
|
|
|
|
(font-lock-add-keywords
|
|
|
|
|
nil
|
|
|
|
|
(list
|
|
|
|
|
;; Show indentation SPACEs (TABs)
|
|
|
|
|
(list (whitespace-indentation-regexp 'space)
|
|
|
|
|
1 whitespace-indentation t))
|
|
|
|
|
t)))
|
2008-04-26 11:38:50 +00:00
|
|
|
|
(when (memq 'empty whitespace-active-style)
|
2008-01-25 14:09:57 +00:00
|
|
|
|
(font-lock-add-keywords
|
|
|
|
|
nil
|
|
|
|
|
(list
|
|
|
|
|
;; Show empty lines at beginning of buffer
|
2009-09-25 02:23:51 +00:00
|
|
|
|
(list #'whitespace-empty-at-bob-regexp
|
2008-01-31 16:08:29 +00:00
|
|
|
|
1 whitespace-empty t))
|
2008-01-25 14:09:57 +00:00
|
|
|
|
t)
|
|
|
|
|
(font-lock-add-keywords
|
|
|
|
|
nil
|
|
|
|
|
(list
|
|
|
|
|
;; Show empty lines at end of buffer
|
2009-09-25 02:23:51 +00:00
|
|
|
|
(list #'whitespace-empty-at-eob-regexp
|
2008-01-31 16:08:29 +00:00
|
|
|
|
1 whitespace-empty t))
|
2008-01-25 14:09:57 +00:00
|
|
|
|
t))
|
2008-04-16 03:41:17 +00:00
|
|
|
|
(cond
|
2008-04-26 11:38:50 +00:00
|
|
|
|
((memq 'space-after-tab whitespace-active-style)
|
2008-01-25 14:09:57 +00:00
|
|
|
|
(font-lock-add-keywords
|
|
|
|
|
nil
|
|
|
|
|
(list
|
2008-04-16 03:41:17 +00:00
|
|
|
|
;; Show SPACEs after TAB (indent-tabs-mode)
|
|
|
|
|
(list (whitespace-space-after-tab-regexp)
|
2008-01-31 16:08:29 +00:00
|
|
|
|
1 whitespace-space-after-tab t))
|
2008-01-25 14:09:57 +00:00
|
|
|
|
t))
|
2008-04-26 11:38:50 +00:00
|
|
|
|
((memq 'space-after-tab::tab whitespace-active-style)
|
2008-04-16 03:41:17 +00:00
|
|
|
|
(font-lock-add-keywords
|
|
|
|
|
nil
|
|
|
|
|
(list
|
|
|
|
|
;; Show SPACEs after TAB (SPACEs)
|
|
|
|
|
(list (whitespace-space-after-tab-regexp 'tab)
|
|
|
|
|
1 whitespace-space-after-tab t))
|
|
|
|
|
t))
|
2008-04-26 11:38:50 +00:00
|
|
|
|
((memq 'space-after-tab::space whitespace-active-style)
|
2008-04-16 03:41:17 +00:00
|
|
|
|
(font-lock-add-keywords
|
|
|
|
|
nil
|
|
|
|
|
(list
|
|
|
|
|
;; Show SPACEs after TAB (TABs)
|
|
|
|
|
(list (whitespace-space-after-tab-regexp 'space)
|
|
|
|
|
1 whitespace-space-after-tab t))
|
|
|
|
|
t)))
|
2008-01-17 12:46:55 +00:00
|
|
|
|
;; now turn on font lock and highlight blanks
|
|
|
|
|
(font-lock-mode 1)))
|
|
|
|
|
|
|
|
|
|
|
2008-01-31 16:08:29 +00:00
|
|
|
|
(defun whitespace-color-off ()
|
2008-01-21 12:45:58 +00:00
|
|
|
|
"Turn off color visualization."
|
2008-04-26 11:38:50 +00:00
|
|
|
|
;; turn off font lock
|
|
|
|
|
(when (whitespace-style-face-p)
|
2008-01-21 12:45:58 +00:00
|
|
|
|
(font-lock-mode 0)
|
2010-08-21 04:43:04 +00:00
|
|
|
|
(remove-hook 'post-command-hook #'whitespace-post-command-hook t)
|
|
|
|
|
(remove-hook 'before-change-functions #'whitespace-buffer-changed t)
|
2008-01-31 16:08:29 +00:00
|
|
|
|
(when whitespace-font-lock
|
|
|
|
|
(setq whitespace-font-lock nil
|
|
|
|
|
font-lock-keywords whitespace-font-lock-keywords))
|
2008-01-17 12:46:55 +00:00
|
|
|
|
;; restore original font lock state
|
2008-01-31 16:08:29 +00:00
|
|
|
|
(font-lock-mode whitespace-font-lock-mode)))
|
2008-01-17 12:46:55 +00:00
|
|
|
|
|
2009-09-25 02:23:51 +00:00
|
|
|
|
|
|
|
|
|
(defun whitespace-trailing-regexp (limit)
|
2009-09-28 01:57:33 +00:00
|
|
|
|
"Match trailing spaces which do not contain the point at end of line."
|
2009-09-25 02:23:51 +00:00
|
|
|
|
(let ((status t))
|
|
|
|
|
(while (if (re-search-forward whitespace-trailing-regexp limit t)
|
2011-10-31 01:39:04 +00:00
|
|
|
|
(= whitespace-point (match-end 1)) ;; loop if point at eol
|
|
|
|
|
(setq status nil))) ;; end of buffer
|
2009-09-25 02:23:51 +00:00
|
|
|
|
status))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
(defun whitespace-empty-at-bob-regexp (limit)
|
2009-09-28 01:57:33 +00:00
|
|
|
|
"Match spaces at beginning of buffer which do not contain the point at \
|
2009-09-25 02:23:51 +00:00
|
|
|
|
beginning of buffer."
|
2010-08-21 04:43:04 +00:00
|
|
|
|
(let ((b (point))
|
|
|
|
|
r)
|
|
|
|
|
(cond
|
|
|
|
|
;; at bob
|
|
|
|
|
((= b 1)
|
|
|
|
|
(setq r (and (/= whitespace-point 1)
|
|
|
|
|
(looking-at whitespace-empty-at-bob-regexp)))
|
2011-05-04 01:02:09 +00:00
|
|
|
|
(set-marker whitespace-bob-marker (if r (match-end 1) b)))
|
2010-08-21 04:43:04 +00:00
|
|
|
|
;; inside bob empty region
|
|
|
|
|
((<= limit whitespace-bob-marker)
|
|
|
|
|
(setq r (looking-at whitespace-empty-at-bob-regexp))
|
|
|
|
|
(if r
|
|
|
|
|
(when (< (match-end 1) limit)
|
|
|
|
|
(set-marker whitespace-bob-marker (match-end 1)))
|
|
|
|
|
(set-marker whitespace-bob-marker b)))
|
|
|
|
|
;; intersection with end of bob empty region
|
|
|
|
|
((<= b whitespace-bob-marker)
|
|
|
|
|
(setq r (looking-at whitespace-empty-at-bob-regexp))
|
2011-05-04 01:02:09 +00:00
|
|
|
|
(set-marker whitespace-bob-marker (if r (match-end 1) b)))
|
2010-08-21 04:43:04 +00:00
|
|
|
|
;; it is not inside bob empty region
|
|
|
|
|
(t
|
|
|
|
|
(setq r nil)))
|
|
|
|
|
;; move to end of matching
|
|
|
|
|
(and r (goto-char (match-end 1)))
|
|
|
|
|
r))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
(defsubst whitespace-looking-back (regexp limit)
|
|
|
|
|
(save-excursion
|
|
|
|
|
(when (/= 0 (skip-chars-backward " \t\n" limit))
|
|
|
|
|
(unless (bolp)
|
|
|
|
|
(forward-line 1))
|
|
|
|
|
(looking-at regexp))))
|
2009-09-25 02:23:51 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
(defun whitespace-empty-at-eob-regexp (limit)
|
2009-09-28 01:57:33 +00:00
|
|
|
|
"Match spaces at end of buffer which do not contain the point at end of \
|
2009-09-25 02:23:51 +00:00
|
|
|
|
buffer."
|
2010-08-21 04:43:04 +00:00
|
|
|
|
(let ((b (point))
|
|
|
|
|
(e (1+ (buffer-size)))
|
|
|
|
|
r)
|
|
|
|
|
(cond
|
|
|
|
|
;; at eob
|
|
|
|
|
((= limit e)
|
|
|
|
|
(when (/= whitespace-point e)
|
|
|
|
|
(goto-char limit)
|
|
|
|
|
(setq r (whitespace-looking-back whitespace-empty-at-eob-regexp b)))
|
|
|
|
|
(if r
|
|
|
|
|
(set-marker whitespace-eob-marker (match-beginning 1))
|
|
|
|
|
(set-marker whitespace-eob-marker limit)
|
|
|
|
|
(goto-char b))) ; return back to initial position
|
|
|
|
|
;; inside eob empty region
|
|
|
|
|
((>= b whitespace-eob-marker)
|
|
|
|
|
(goto-char limit)
|
|
|
|
|
(setq r (whitespace-looking-back whitespace-empty-at-eob-regexp b))
|
|
|
|
|
(if r
|
|
|
|
|
(when (> (match-beginning 1) b)
|
|
|
|
|
(set-marker whitespace-eob-marker (match-beginning 1)))
|
|
|
|
|
(set-marker whitespace-eob-marker limit)
|
|
|
|
|
(goto-char b))) ; return back to initial position
|
|
|
|
|
;; intersection with beginning of eob empty region
|
|
|
|
|
((>= limit whitespace-eob-marker)
|
|
|
|
|
(goto-char limit)
|
|
|
|
|
(setq r (whitespace-looking-back whitespace-empty-at-eob-regexp b))
|
|
|
|
|
(if r
|
|
|
|
|
(set-marker whitespace-eob-marker (match-beginning 1))
|
|
|
|
|
(set-marker whitespace-eob-marker limit)
|
|
|
|
|
(goto-char b))) ; return back to initial position
|
|
|
|
|
;; it is not inside eob empty region
|
|
|
|
|
(t
|
|
|
|
|
(setq r nil)))
|
|
|
|
|
r))
|
|
|
|
|
|
|
|
|
|
|
2011-04-19 13:44:55 +00:00
|
|
|
|
(defun whitespace-buffer-changed (_beg _end)
|
2010-08-21 04:43:04 +00:00
|
|
|
|
"Set `whitespace-buffer-changed' variable to t."
|
|
|
|
|
(setq whitespace-buffer-changed t))
|
2009-09-25 02:23:51 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
(defun whitespace-post-command-hook ()
|
|
|
|
|
"Save current point into `whitespace-point' variable.
|
|
|
|
|
Also refontify when necessary."
|
2010-08-21 04:43:04 +00:00
|
|
|
|
(setq whitespace-point (point)) ; current point position
|
|
|
|
|
(let ((refontify
|
|
|
|
|
(or
|
|
|
|
|
;; it is at end of line ...
|
|
|
|
|
(and (eolp)
|
|
|
|
|
;; ... with trailing SPACE or TAB
|
|
|
|
|
(or (= (preceding-char) ?\ )
|
|
|
|
|
(= (preceding-char) ?\t)))
|
|
|
|
|
;; it is at beginning of buffer (bob)
|
|
|
|
|
(= whitespace-point 1)
|
|
|
|
|
;; the buffer was modified and ...
|
|
|
|
|
(and whitespace-buffer-changed
|
|
|
|
|
(or
|
|
|
|
|
;; ... or inside bob whitespace region
|
|
|
|
|
(<= whitespace-point whitespace-bob-marker)
|
|
|
|
|
;; ... or at bob whitespace region border
|
|
|
|
|
(and (= whitespace-point (1+ whitespace-bob-marker))
|
|
|
|
|
(= (preceding-char) ?\n))))
|
|
|
|
|
;; it is at end of buffer (eob)
|
|
|
|
|
(= whitespace-point (1+ (buffer-size)))
|
|
|
|
|
;; the buffer was modified and ...
|
|
|
|
|
(and whitespace-buffer-changed
|
|
|
|
|
(or
|
|
|
|
|
;; ... or inside eob whitespace region
|
|
|
|
|
(>= whitespace-point whitespace-eob-marker)
|
|
|
|
|
;; ... or at eob whitespace region border
|
|
|
|
|
(and (= whitespace-point (1- whitespace-eob-marker))
|
|
|
|
|
(= (following-char) ?\n)))))))
|
|
|
|
|
(when (or refontify (> whitespace-font-lock-refontify 0))
|
|
|
|
|
(setq whitespace-buffer-changed nil)
|
|
|
|
|
;; adjust refontify counter
|
|
|
|
|
(setq whitespace-font-lock-refontify
|
|
|
|
|
(if refontify
|
|
|
|
|
1
|
|
|
|
|
(1- whitespace-font-lock-refontify)))
|
|
|
|
|
;; refontify
|
2009-09-25 02:23:51 +00:00
|
|
|
|
(jit-lock-refontify))))
|
|
|
|
|
|
2008-01-17 12:46:55 +00:00
|
|
|
|
|
|
|
|
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
|
|
|
;;;; Hacked from visws.el (Miles Bader <miles@gnu.org>)
|
|
|
|
|
|
|
|
|
|
|
2008-04-26 11:38:50 +00:00
|
|
|
|
(defun whitespace-style-mark-p ()
|
|
|
|
|
"Return t if there is some visualization via display table."
|
|
|
|
|
(or (memq 'tab-mark whitespace-active-style)
|
|
|
|
|
(memq 'space-mark whitespace-active-style)
|
|
|
|
|
(memq 'newline-mark whitespace-active-style)))
|
|
|
|
|
|
|
|
|
|
|
2008-01-31 16:08:29 +00:00
|
|
|
|
(defsubst whitespace-char-valid-p (char)
|
2008-01-17 12:46:55 +00:00
|
|
|
|
;; This check should be improved!!!
|
|
|
|
|
(or (< char 256)
|
2008-02-02 04:17:54 +00:00
|
|
|
|
(characterp char)))
|
2008-01-17 12:46:55 +00:00
|
|
|
|
|
|
|
|
|
|
2008-01-31 16:08:29 +00:00
|
|
|
|
(defun whitespace-display-vector-p (vec)
|
2008-01-17 12:46:55 +00:00
|
|
|
|
"Return true if every character in vector VEC can be displayed."
|
|
|
|
|
(let ((i (length vec)))
|
|
|
|
|
(when (> i 0)
|
|
|
|
|
(while (and (>= (setq i (1- i)) 0)
|
2008-01-31 16:08:29 +00:00
|
|
|
|
(whitespace-char-valid-p (aref vec i))))
|
2008-01-17 12:46:55 +00:00
|
|
|
|
(< i 0))))
|
|
|
|
|
|
|
|
|
|
|
2008-01-31 16:08:29 +00:00
|
|
|
|
(defun whitespace-display-char-on ()
|
2008-01-17 12:46:55 +00:00
|
|
|
|
"Turn on character display mapping."
|
2008-04-26 11:38:50 +00:00
|
|
|
|
(when (and whitespace-display-mappings
|
|
|
|
|
(whitespace-style-mark-p))
|
2008-01-17 12:46:55 +00:00
|
|
|
|
(let (vecs vec)
|
|
|
|
|
;; Remember whether a buffer has a local display table.
|
2008-01-31 16:08:29 +00:00
|
|
|
|
(unless whitespace-display-table-was-local
|
|
|
|
|
(setq whitespace-display-table-was-local t
|
|
|
|
|
whitespace-display-table
|
2010-08-21 04:43:04 +00:00
|
|
|
|
(copy-sequence buffer-display-table))
|
2011-11-14 23:59:56 +00:00
|
|
|
|
;; Assure `buffer-display-table' is unique
|
2010-08-21 04:43:04 +00:00
|
|
|
|
;; when two or more windows are visible.
|
|
|
|
|
(setq buffer-display-table
|
2008-01-17 12:46:55 +00:00
|
|
|
|
(copy-sequence buffer-display-table)))
|
|
|
|
|
(unless buffer-display-table
|
|
|
|
|
(setq buffer-display-table (make-display-table)))
|
2008-01-31 16:08:29 +00:00
|
|
|
|
(dolist (entry whitespace-display-mappings)
|
2008-04-16 03:41:17 +00:00
|
|
|
|
;; check if it is to display this mark
|
2008-04-26 11:38:50 +00:00
|
|
|
|
(when (memq (car entry) whitespace-style)
|
2008-04-16 03:41:17 +00:00
|
|
|
|
;; Get a displayable mapping.
|
|
|
|
|
(setq vecs (cddr entry))
|
|
|
|
|
(while (and vecs
|
|
|
|
|
(not (whitespace-display-vector-p (car vecs))))
|
|
|
|
|
(setq vecs (cdr vecs)))
|
|
|
|
|
;; Display a valid mapping.
|
|
|
|
|
(when vecs
|
|
|
|
|
(setq vec (copy-sequence (car vecs)))
|
|
|
|
|
;; NEWLINE char
|
|
|
|
|
(when (and (eq (cadr entry) ?\n)
|
2008-04-26 11:38:50 +00:00
|
|
|
|
(memq 'newline whitespace-active-style))
|
2008-04-16 03:41:17 +00:00
|
|
|
|
;; Only insert face bits on NEWLINE char mapping to avoid
|
|
|
|
|
;; obstruction of other faces like TABs and (HARD) SPACEs
|
|
|
|
|
;; faces, font-lock faces, etc.
|
2008-01-17 12:46:55 +00:00
|
|
|
|
(dotimes (i (length vec))
|
|
|
|
|
(or (eq (aref vec i) ?\n)
|
2008-01-31 16:08:29 +00:00
|
|
|
|
(aset vec i
|
|
|
|
|
(make-glyph-code (aref vec i)
|
|
|
|
|
whitespace-newline)))))
|
2008-01-17 12:46:55 +00:00
|
|
|
|
;; Display mapping
|
2008-04-16 03:41:17 +00:00
|
|
|
|
(aset buffer-display-table (cadr entry) vec)))))))
|
2008-01-17 12:46:55 +00:00
|
|
|
|
|
|
|
|
|
|
2008-01-31 16:08:29 +00:00
|
|
|
|
(defun whitespace-display-char-off ()
|
2008-01-17 12:46:55 +00:00
|
|
|
|
"Turn off character display mapping."
|
2008-01-31 16:08:29 +00:00
|
|
|
|
(and whitespace-display-mappings
|
2008-04-26 11:38:50 +00:00
|
|
|
|
(whitespace-style-mark-p)
|
2008-01-31 16:08:29 +00:00
|
|
|
|
whitespace-display-table-was-local
|
|
|
|
|
(setq whitespace-display-table-was-local nil
|
|
|
|
|
buffer-display-table whitespace-display-table)))
|
2008-01-28 13:58:19 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
2008-03-01 19:00:24 +00:00
|
|
|
|
;;;; Hook
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
(defun whitespace-action-when-on ()
|
|
|
|
|
"Action to be taken always when local whitespace is turned on."
|
|
|
|
|
(cond ((memq 'cleanup whitespace-action)
|
|
|
|
|
(whitespace-cleanup))
|
|
|
|
|
((memq 'report-on-bogus whitespace-action)
|
|
|
|
|
(whitespace-report nil t))))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
(defun whitespace-write-file-hook ()
|
|
|
|
|
"Action to be taken when buffer is written.
|
|
|
|
|
It should be added buffer-locally to `write-file-functions'."
|
|
|
|
|
(cond ((memq 'auto-cleanup whitespace-action)
|
2008-10-02 00:49:49 +00:00
|
|
|
|
(whitespace-cleanup))
|
2008-03-01 19:00:24 +00:00
|
|
|
|
((memq 'abort-on-bogus whitespace-action)
|
2008-10-02 00:49:49 +00:00
|
|
|
|
(when (whitespace-report nil t)
|
|
|
|
|
(error "Abort write due to whitespace problems in %s"
|
|
|
|
|
(buffer-name)))))
|
|
|
|
|
nil) ; continue hook processing
|
2008-03-01 19:00:24 +00:00
|
|
|
|
|
2008-09-06 00:19:31 +00:00
|
|
|
|
|
|
|
|
|
(defun whitespace-warn-read-only (msg)
|
|
|
|
|
"Warn if buffer is read-only."
|
2008-10-02 00:49:49 +00:00
|
|
|
|
(when (memq 'warn-if-read-only whitespace-action)
|
2008-09-06 00:19:31 +00:00
|
|
|
|
(message "Can't %s: %s is read-only" msg (buffer-name))))
|
|
|
|
|
|
2008-03-01 19:00:24 +00:00
|
|
|
|
|
|
|
|
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
2008-01-17 12:46:55 +00:00
|
|
|
|
|
|
|
|
|
|
2008-02-01 11:25:16 +00:00
|
|
|
|
(defun whitespace-unload-function ()
|
2008-03-01 19:00:24 +00:00
|
|
|
|
"Unload the whitespace library."
|
|
|
|
|
(global-whitespace-mode -1)
|
|
|
|
|
;; be sure all local whitespace mode is turned off
|
|
|
|
|
(save-current-buffer
|
|
|
|
|
(dolist (buf (buffer-list))
|
|
|
|
|
(set-buffer buf)
|
|
|
|
|
(whitespace-mode -1)))
|
|
|
|
|
nil) ; continue standard unloading
|
|
|
|
|
|
2008-02-01 11:25:16 +00:00
|
|
|
|
|
2008-01-31 16:08:29 +00:00
|
|
|
|
(provide 'whitespace)
|
2008-01-17 12:46:55 +00:00
|
|
|
|
|
|
|
|
|
|
2008-01-31 16:08:29 +00:00
|
|
|
|
(run-hooks 'whitespace-load-hook)
|
2008-01-17 12:46:55 +00:00
|
|
|
|
|
|
|
|
|
|
2008-01-31 16:08:29 +00:00
|
|
|
|
;;; whitespace.el ends here
|