+2006-11-04 Martin Rudalics <rudalics@gmx.at>
+
+ * whitespace.el (whitespace-indent-regexp): Make this match any
+ multiples of eight spaces near the beginning of a line.
+ (whitespace-buffer): Use `remove-overlays' instead of
+ `whitespace-unhighlight-the-space' and `overlay-recenter' to
+ speed up overlay handling.
+ (whitespace-buffer-leading, whitespace-buffer-trailing): Make
+ these functions highlight the text removed by
+ `whitespace-buffer-leading-cleanup' and
+ `whitespace-buffer-trailing-cleanup' respectively.
+ (whitespace-buffer-search): Use `with-local-quit'. Move
+ `format' out of loop to speed up scanning larger buffers.
+ (whitespace-unhighlight-the-space): Remove `remove-hook' since
+ that function is never added to a hook.
+ (whitespace-spacetab-regexp, whitespace-ateol-regexp)
+ (whitespace-buffer-leading-cleanup)
+ (whitespace-refresh-rescan-list): Fix docstrings.
+
2006-11-03 Ken Manheimer <ken.manheimer@gmail.com>
* allout.el (allout-during-yank-processing): Cue for inhibiting
* midnight.el (midnight-buffer-display-time): Doc fix.
(clean-buffer-list-kill-never-buffer-names): Add "*server*".
-2006-10-22 martin rudalics <rudalics@gmx.at>
+2006-10-22 Martin Rudalics <rudalics@gmx.at>
* textmodes/flyspell.el (flyspell-check-region-doublons):
Fix last fix.
event to unread-command-events as (t . EVENT) so it will be added
to this-command-keys by read-key-sequence.
-2006-10-22 martin rudalics <rudalics@gmx.at>
+2006-10-22 Martin Rudalics <rudalics@gmx.at>
* textmodes/flyspell.el (flyspell-word): Skip past all previous
whitespace when checking doublons.
:group 'whitespace)
(defcustom whitespace-spacetab-regexp "[ ]+\t"
- "Regexp to match a space followed by a TAB."
+ "Regexp to match one or more spaces followed by a TAB."
:type 'regexp
:group 'whitespace)
:type 'boolean
:group 'whitespace)
-(defcustom whitespace-indent-regexp (concat "^\\(\t*\\) " " ")
- "Regexp to match (any TABS followed by) 8/more whitespaces at start of line."
+(defcustom whitespace-indent-regexp "^\t*\\( \\)+"
+ "Regexp to match multiples of eight spaces near line beginnings.
+The default value ignores leading TABs."
:type 'regexp
:group 'whitespace)
:type 'boolean
:group 'whitespace)
-;; (defcustom whitespace-ateol-regexp "[ \t]$"
(defcustom whitespace-ateol-regexp "[ \t]+$"
- "Regexp to match a TAB or a space at the EOL."
+ "Regexp to match one or more TABs or spaces at line ends."
:type 'regexp
:group 'whitespace)
(progn
(whitespace-check-buffer-list (buffer-name) buffer-file-name)
(whitespace-tickle-timer)
- (whitespace-unhighlight-the-space)
+ (remove-overlays nil nil 'face 'whitespace-highlight)
+ (overlay-recenter (point-max))
(if whitespace-auto-cleanup
(if buffer-read-only
(if (not quiet)
(whitespace-buffer t)))
(defun whitespace-buffer-leading ()
- "Check to see if there are any empty lines at the top of the file."
+ "Return t if the current buffer has leading newline characters.
+If highlighting is enabled, highlight these characters."
(save-excursion
- (let ((pmin nil)
- (pmax nil))
- (goto-char (point-min))
- (beginning-of-line)
- (setq pmin (point))
- (end-of-line)
- (setq pmax (point))
- (if (equal pmin pmax)
- (progn
- (whitespace-highlight-the-space pmin (1+ pmax))
- t)
- nil))))
+ (goto-char (point-min))
+ (skip-chars-forward "\n")
+ (unless (bobp)
+ (whitespace-highlight-the-space (point-min) (point))
+ t)))
(defun whitespace-buffer-leading-cleanup ()
- "Remove any empty lines at the top of the file."
+ "Remove any leading newline characters from current buffer."
(save-excursion
(goto-char (point-min))
(skip-chars-forward "\n")
(delete-region (point-min) (point))))
(defun whitespace-buffer-trailing ()
- "Check to see if are is more than one empty line at the bottom."
+ "Return t if the current buffer has extra trailing newline characters.
+If highlighting is enabled, highlight these characters."
(save-excursion
- (let ((pmin nil)
- (pmax nil))
- (goto-char (point-max))
- (beginning-of-line)
- (setq pmin (point))
- (end-of-line)
- (setq pmax (point))
- (if (equal pmin pmax)
- (progn
- (goto-char (- (point) 1))
- (beginning-of-line)
- (setq pmin (point))
- (end-of-line)
- (setq pmax (point))
- (if (equal pmin pmax)
- (progn
- (whitespace-highlight-the-space (- pmin 1) pmax)
- t)
- nil))
- nil))))
+ (goto-char (point-max))
+ (skip-chars-backward "\n")
+ (forward-line)
+ (unless (eobp)
+ (whitespace-highlight-the-space (point) (point-max))
+ t)))
(defun whitespace-buffer-trailing-cleanup ()
- "Delete all the empty lines at the bottom."
+ "Remove extra trailing newline characters from current buffer."
(save-excursion
(goto-char (point-max))
(skip-chars-backward "\n")
- (if (not (bolp))
- (forward-char 1))
- (delete-region (point) (point-max))))
+ (unless (eobp)
+ (forward-line)
+ (delete-region (point) (point-max)))))
(defun whitespace-buffer-search (regexp)
"Search for any given whitespace REGEXP."
- (let ((whitespace-retval ""))
- (save-excursion
- (goto-char (point-min))
- (while (re-search-forward regexp nil t)
- (progn
- (setq whitespace-retval (format "%s %s" whitespace-retval
- (match-beginning 0)))
- (whitespace-highlight-the-space (match-beginning 0) (match-end 0))))
- (if (equal "" whitespace-retval)
- nil
- whitespace-retval))))
+ (with-local-quit
+ (let (whitespace-retval)
+ (save-excursion
+ (goto-char (point-min))
+ (while (re-search-forward regexp nil t)
+ (whitespace-highlight-the-space (match-beginning 0) (match-end 0))
+ (push (match-beginning 0) whitespace-retval)))
+ (when whitespace-retval
+ (format " %s" (nreverse whitespace-retval))))))
(defun whitespace-buffer-cleanup (regexp newregexp)
"Search for any given whitespace REGEXP and replace it with the NEWREGEXP."
"Highlight the current line, unhighlighting a previously jumped to line."
(if whitespace-display-spaces-in-color
(let ((ol (whitespace-make-overlay b e)))
- (push ol whitespace-highlighted-space)
(whitespace-overlay-put ol 'face 'whitespace-highlight))))
-;; (add-hook 'pre-command-hook 'whitespace-unhighlight-the-space))
(defun whitespace-unhighlight-the-space()
"Unhighlight the currently highlight line."
(if (and whitespace-display-spaces-in-color whitespace-highlighted-space)
(progn
(mapc 'whitespace-delete-overlay whitespace-highlighted-space)
- (setq whitespace-highlighted-space nil))
- (remove-hook 'pre-command-hook 'whitespace-unhighlight-the-space)))
+ (setq whitespace-highlighted-space nil))))
(defun whitespace-check-buffer-list (buf-name buf-file)
"Add a buffer and its file to the whitespace monitor list.
(whitespace-refresh-rescan-list buffile bufname))))))
(defun whitespace-refresh-rescan-list (buffile bufname)
- "Refresh the list of files to be rescaned for whitespace creep."
+ "Refresh the list of files to be rescanned for whitespace creep."
(if whitespace-all-buffer-files
(setq whitespace-all-buffer-files
(delete (list buffile bufname) whitespace-all-buffer-files))