[Emacs-diffs] Changes to emacs/lisp/whitespace.el

[Juanma Barranquero]

Index: emacs/lisp/whitespace.el
diff -c emacs/lisp/whitespace.el:1.38 emacs/lisp/whitespace.el:1.39
*** emacs/lisp/whitespace.el:1.38       Fri Jul  8 22:33:00 2005
--- emacs/lisp/whitespace.el    Wed Jul 13 10:32:08 2005
***************
*** 109,140 ****
  (put 'whitespace-mode-line 'permanent-local nil)
  
  (defvar whitespace-check-buffer-leading nil
!   "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")
  (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")
  (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")
  (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")
  (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")
  (make-variable-buffer-local 'whitespace-highlighted-space)
  (put 'whitespace-highlighted-space 'permanent-local nil)
  
--- 109,140 ----
  (put 'whitespace-mode-line 'permanent-local nil)
  
  (defvar whitespace-check-buffer-leading nil
!   "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.")
  (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.")
  (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.")
  (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.")
  (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.")
  (make-variable-buffer-local 'whitespace-highlighted-space)
  (put 'whitespace-highlighted-space 'permanent-local nil)
  
***************
*** 142,154 ****
  (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
! 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
! don't define defcustom"
        `(defvar ,sym ,val ,doc))))
  
  (if (fboundp 'make-overlay)
--- 142,153 ----
  (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 
it."
        t))
    (if (not (fboundp 'defcustom))
        (defmacro defcustom (sym val doc &rest args)
!       "Macro to alias `defcustom' to `defvar' in all versions of Emacs that
! don't define it."
        `(defvar ,sym ,val ,doc))))
  
  (if (fboundp 'make-overlay)
***************
*** 180,202 ****
    :group 'convenience))
  
  (defcustom whitespace-check-leading-whitespace t
!   "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'"
    :type 'boolean
    :group 'whitespace)
  
  (defcustom whitespace-check-trailing-whitespace t
!   "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'"
    :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.
  It can be overriden by setting a buffer local variable
! `whitespace-check-buffer-spacetab'"
    :type 'boolean
    :group 'whitespace)
  
--- 179,201 ----
    :group 'convenience))
  
  (defcustom whitespace-check-leading-whitespace t
!   "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'."
    :type 'boolean
    :group 'whitespace)
  
  (defcustom whitespace-check-trailing-whitespace t
!   "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'."
    :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.
  It can be overriden by setting a buffer local variable
! `whitespace-check-buffer-spacetab'."
    :type 'boolean
    :group 'whitespace)
  
***************
*** 206,214 ****
    :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)
  
--- 205,213 ----
    :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)
  
***************
*** 218,226 ****
    :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)
  
--- 217,225 ----
    :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)
  
***************
*** 242,250 ****
    :group 'whitespace)
  
  (defcustom whitespace-abort-on-error nil
!   "While writing a file, abort if the file is unclean. If
! `whitespace-auto-cleanup' is set, that takes precedence over this
! variable."
    :type  'boolean
    :group 'whitespace)
  
--- 241,249 ----
    :group 'whitespace)
  
  (defcustom whitespace-abort-on-error nil
!   "While writing a file, abort if the file is unclean.
! If `whitespace-auto-cleanup' is set, that takes precedence over
! this variable."
    :type  'boolean
    :group 'whitespace)
  
***************
*** 277,283 ****
                                       tcl-mode tex-mode texinfo-mode
                                       vrml-mode xml-mode)
  
!   "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
--- 276,282 ----
                                       tcl-mode tex-mode texinfo-mode
                                       vrml-mode xml-mode)
  
!   "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