emacs: lisp/whitespace.el comparison

comparison lisp/whitespace.el @ 90650:02cf29720f31

Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 490-504) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 161-163) - Update from CVS - Merge from emacs--devo--0 Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-130

author	Miles Bader <miles@gnu.org>
date	Tue, 07 Nov 2006 23:22:48 +0000
parents	6823a91487f2 75af8d959739
children	f1d13e615070

comparison

equal deleted inserted replaced

-:d53934e7ddef
+:02cf29720f31
 `whitespace-check-buffer-spacetab'."
 :type 'boolean
 :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)
 (defcustom whitespace-check-indent-whitespace indent-tabs-mode
 "Flag to check indentation whitespace.  This is the global for the system.
 It can be overriden by setting a buffer local variable
 `whitespace-check-buffer-indent'."
 :type 'boolean
 :group 'whitespace)
-(defcustom whitespace-indent-regexp (concat "^\\(\t*\\)    " "    ")
+(defcustom whitespace-indent-regexp "^\t*\\(        \\)+"
-"Regexp to match (any TABS followed by) 8/more whitespaces at start of line."
+"Regexp to match multiples of eight spaces near line beginnings.
+The default value ignores leading TABs."
 :type 'regexp
 :group 'whitespace)
 (defcustom whitespace-check-ateol-whitespace t
 "Flag to check end-of-line whitespace.  This is the global for the system.
 It can be overriden by setting a buffer local variable
 `whitespace-check-buffer-ateol'."
 :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)
 (defcustom whitespace-errbuf "*Whitespace Errors*"
 "The name of the buffer where whitespace related messages will be logged."
 (whitespace-check-whitespace-mode current-prefix-arg)
 (if (and buffer-file-name (> (buffer-size) 0) whitespace-mode)
 	(progn
 	  (whitespace-check-buffer-list (buffer-name) buffer-file-name)
 	  (whitespace-tickle-timer)
-	  (whitespace-unhighlight-the-space)
+	  (overlay-recenter (point-max))
+	  (remove-overlays nil nil 'face 'whitespace-highlight)
 	  (if whitespace-auto-cleanup
 	      (if buffer-read-only
 		  (if (not quiet)
 		      (message "Can't cleanup: %s is read-only" (buffer-name)))
 		(whitespace-cleanup-internal))
 (narrow-to-region s e)
 (whitespace-cleanup-internal t))
 (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)
+(goto-char (point-min))
-	  (pmax nil))
+(skip-chars-forward "\n")
-(goto-char (point-min))
+(unless (bobp)
-(beginning-of-line)
+(whitespace-highlight-the-space (point-min) (point))
-(setq pmin (point))
+t)))
-(end-of-line)
-(setq pmax (point))
-(if (equal pmin pmax)
-	  (progn
-	    (whitespace-highlight-the-space pmin (1+ pmax))
-	    t)
-	nil))))
 (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.
-(save-excursion
+If highlighting is enabled, highlight these characters."
-(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))))
-(defun whitespace-buffer-trailing-cleanup ()
-"Delete all the empty lines at the bottom."
 (save-excursion
 (goto-char (point-max))
 (skip-chars-backward "\n")
-(if (not (bolp))
+(forward-line)
-	(forward-char 1))
+(unless (eobp)
-(delete-region (point) (point-max))))
+(whitespace-highlight-the-space (point) (point-max))
+t)))
+(defun whitespace-buffer-trailing-cleanup ()
+"Remove extra trailing newline characters from current buffer."
+(save-excursion
+(goto-char (point-max))
+(skip-chars-backward "\n")
+(unless (eobp)
+(forward-line)
+(delete-region (point) (point-max)))))
 (defun whitespace-buffer-search (regexp)
 "Search for any given whitespace REGEXP."
-(let ((whitespace-retval ""))
+(with-local-quit
-(save-excursion
+(let (whitespace-retval)
-(goto-char (point-min))
+(save-excursion
-(while (re-search-forward regexp nil t)
+	(goto-char (point-min))
-	(progn
+	(while (re-search-forward regexp nil t)
-	  (setq whitespace-retval (format "%s %s" whitespace-retval
+	  (whitespace-highlight-the-space (match-beginning 0) (match-end 0))
-					(match-beginning 0)))
+	  (push (match-beginning 0) whitespace-retval)))
-	(whitespace-highlight-the-space (match-beginning 0) (match-end 0))))
+(when whitespace-retval
-(if (equal "" whitespace-retval)
+	(format " %s" (nreverse whitespace-retval))))))
-	  nil
-	whitespace-retval))))
 (defun whitespace-buffer-cleanup (regexp newregexp)
 "Search for any given whitespace REGEXP and replace it with the NEWREGEXP."
 (save-excursion
 (goto-char (point-min))
 (defun whitespace-highlight-the-space (b e)
 "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))
+	(setq whitespace-highlighted-space nil))))
-(remove-hook 'pre-command-hook 'whitespace-unhighlight-the-space)))
 (defun whitespace-check-buffer-list (buf-name buf-file)
 "Add a buffer and its file to the whitespace monitor list.
 The buffer named BUF-NAME and its associated file BUF-FILE are now monitored
 		(whitespace-refresh-rescan-list buffile bufname)))
 	  ;;(message "Removing %s from refresh list" bufname)
 	  (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))
 (when whitespace-rescan-timer
 (disable-timeout whitespace-rescan-timer)

Mercurial > emacs

comparison lisp/whitespace.el @ 90650:02cf29720f31