emacs: lisp/whitespace.el comparison

comparison lisp/whitespace.el @ 90201:fbb2bea03df9

Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-69 Merge from emacs--cvs-trunk--0 Patches applied: * emacs--cvs-trunk--0 (patch 474-484) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 88-91) - Merge from emacs--cvs-trunk--0 - Update FSF's address in GPL notices - Update from CVS

author	Miles Bader <miles@gnu.org>
date	Thu, 14 Jul 2005 08:02:00 +0000
parents	f9a65d7ebd29 f44bd79f483b
children	187d6a1f84f7

comparison

equal deleted inserted replaced

-:f9a65d7ebd29
+:fbb2bea03df9
 "String to display in the mode line for Whitespace mode.")
 (make-variable-buffer-local 'whitespace-mode-line)
 (put 'whitespace-mode-line 'permanent-local nil)
 (defvar whitespace-check-buffer-leading nil
-"Test leading whitespace for file in current buffer if t")
+"Test leading whitespace for file in current buffer if t.")
 (make-variable-buffer-local 'whitespace-check-buffer-leading)
 (put 'whitespace-check-buffer-leading 'permanent-local nil)
 (defvar whitespace-check-buffer-trailing nil
-"Test trailing whitespace for file in current buffer if t")
+"Test trailing whitespace for file in current buffer if t.")
 (make-variable-buffer-local 'whitespace-check-buffer-trailing)
 (put 'whitespace-check-buffer-trailing 'permanent-local nil)
 (defvar whitespace-check-buffer-indent nil
-"Test indentation whitespace for file in current buffer if t")
+"Test indentation whitespace for file in current buffer if t.")
 (make-variable-buffer-local 'whitespace-check-buffer-indent)
 (put 'whitespace-check-buffer-indent 'permanent-local nil)
 (defvar whitespace-check-buffer-spacetab nil
-"Test Space-followed-by-TABS whitespace for file in current buffer if t")
+"Test Space-followed-by-TABS whitespace for file in current buffer if t.")
 (make-variable-buffer-local 'whitespace-check-buffer-spacetab)
 (put 'whitespace-check-buffer-spacetab 'permanent-local nil)
 (defvar whitespace-check-buffer-ateol nil
-"Test end-of-line whitespace for file in current buffer if t")
+"Test end-of-line whitespace for file in current buffer if t.")
 (make-variable-buffer-local 'whitespace-check-buffer-ateol)
 (put 'whitespace-check-buffer-ateol 'permanent-local nil)
 (defvar whitespace-highlighted-space nil
-"The variable to store the extent to highlight")
+"The variable to store the extent to highlight.")
 (make-variable-buffer-local 'whitespace-highlighted-space)
 (put 'whitespace-highlighted-space 'permanent-local nil)
 ;; For flavors of Emacs which don't define `defgroup' and `defcustom'.
 (eval-when-compile
 (if (not (fboundp 'defgroup))
 (defmacro defgroup (sym memb doc &rest args)
-	"Null macro for defgroup in all versions of Emacs that don't define
+	"Null macro for `defgroup' in all versions of Emacs that don't define it."
-defgroup"
 	t))
 (if (not (fboundp 'defcustom))
 (defmacro defcustom (sym val doc &rest args)
-	"Macro to alias defcustom to defvar in all versions of Emacs that
+	"Macro to alias `defcustom' to `defvar' in all versions of Emacs that
-don't define defcustom"
+don't define it."
 	`(defvar ,sym ,val ,doc))))
 (if (fboundp 'make-overlay)
 (progn
 (defalias 'whitespace-make-overlay 'make-overlay)
 :version "21.1"
 :link '(emacs-commentary-link "whitespace.el")
 :group 'convenience))
 (defcustom whitespace-check-leading-whitespace t
-"Flag to check leading whitespace. This is the global for the system.
+"Flag to check leading whitespace.  This is the global for the system.
 It can be overriden by setting a buffer local variable
-`whitespace-check-buffer-leading'"
+`whitespace-check-buffer-leading'."
 :type 'boolean
 :group 'whitespace)
 (defcustom whitespace-check-trailing-whitespace t
-"Flag to check trailing whitespace. This is the global for the system.
+"Flag to check trailing whitespace.  This is the global for the system.
 It can be overriden by setting a buffer local variable
-`whitespace-check-buffer-trailing'"
+`whitespace-check-buffer-trailing'."
 :type 'boolean
 :group 'whitespace)
 (defcustom whitespace-check-spacetab-whitespace t
-"Flag to check space followed by a TAB. This is the global for the system.
+"Flag to check space followed by a TAB.  This is the global for the system.
 It can be overriden by setting a buffer local variable
-`whitespace-check-buffer-spacetab'"
+`whitespace-check-buffer-spacetab'."
 :type 'boolean
 :group 'whitespace)
 (defcustom whitespace-spacetab-regexp "[ ]+\t"
 "Regexp to match a space 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.
+"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'"
+`whitespace-check-buffer-indent'."
 :type 'boolean
 :group 'whitespace)
 (defcustom whitespace-indent-regexp (concat "^\\(\t*\\)    " "    ")
 "Regexp to match (any TABS followed by) 8/more whitespaces at start of line."
 :type 'regexp
 :group 'whitespace)
 (defcustom whitespace-check-ateol-whitespace t
-"Flag to check end-of-line whitespace. This is the global for the system.
+"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'"
+`whitespace-check-buffer-ateol'."
 :type 'boolean
 :group 'whitespace)
 ;; (defcustom whitespace-ateol-regexp "[ \t]$"
 (defcustom whitespace-ateol-regexp "[ \t]+$"
 determines a file to be clean."
 :type 'string
 :group 'whitespace)
 (defcustom whitespace-abort-on-error nil
-"While writing a file, abort if the file is unclean. If
+"While writing a file, abort if the file is unclean.
-`whitespace-auto-cleanup' is set, that takes precedence over this
+If `whitespace-auto-cleanup' is set, that takes precedence over
-variable."
+this variable."
 :type  'boolean
 :group 'whitespace)
 (defcustom whitespace-auto-cleanup nil
 "Cleanup a buffer automatically on finding it whitespace unclean."
 				       python-mode scheme-mode sgml-mode
 				       sh-mode shell-script-mode simula-mode
 				       tcl-mode tex-mode texinfo-mode
 				       vrml-mode xml-mode)
-"Major Modes in which we turn on whitespace checking.
+"Major modes in which we turn on whitespace checking.
 These are mostly programming and documentation modes.  But you may add other
 modes that you want whitespaces checked in by adding something like the
 following to your `.emacs':
 	nil))))
 (defun whitespace-buffer-leading-cleanup ()
 "Remove any empty lines at the top of the file."
 (save-excursion
-(let ((pmin nil)
+(goto-char (point-min))
-	  (pmax nil))
+(skip-chars-forward "\n")
-(goto-char (point-min))
+(delete-region (point-min) (point))))
-(beginning-of-line)
-(setq pmin (point))
-(end-of-line)
-(setq pmax (point))
-(if (equal pmin pmax)
-	  (progn
-	    (kill-line)
-	    (whitespace-buffer-leading-cleanup))))))
 (defun whitespace-buffer-trailing ()
 "Check to see if are is more than one empty line at the bottom."
 (save-excursion
 (let ((pmin nil)
 	nil))))
 (defun whitespace-buffer-trailing-cleanup ()
 "Delete all the empty lines at the bottom."
 (save-excursion
-(let ((pmin nil)
+(goto-char (point-max))
-	  (pmax nil))
+(skip-chars-backward "\n")
-(goto-char (point-max))
+(if (not (bolp))
-(beginning-of-line)
+	(forward-char 1))
-(setq pmin (point))
+(delete-region (point) (point-max))))
-(end-of-line)
-(setq pmax (point))
-(if (equal pmin pmax)
-	  (progn
-	    (goto-char (1- pmin))
-	    (beginning-of-line)
-	    (setq pmin (point))
-	    (end-of-line)
-	    (setq pmax (point))
-	    (if (equal pmin pmax)
-		(progn
-		  (goto-char (1- (point-max)))
-		  (beginning-of-line)
-		  (kill-line)
-		  (whitespace-buffer-trailing-cleanup))))))))
 (defun whitespace-buffer-search (regexp)
 "Search for any given whitespace REGEXP."
 (let ((whitespace-retval ""))
 (save-excursion

Mercurial > emacs

comparison lisp/whitespace.el @ 90201:fbb2bea03df9