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

[Vinicius Jose Latorre]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Vinicius Jose Latorre <viniciusjl>      08/09/06 01:36:29

Index: whitespace.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/whitespace.el,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -b -r1.85 -r1.86
--- whitespace.el       6 Sep 2008 00:19:34 -0000       1.85
+++ whitespace.el       6 Sep 2008 01:36:29 -0000       1.86
@@ -2403,15 +2403,16 @@
 (defun whitespace-kill-buffer-hook ()
   "Action to be taken when buffer is killed.
 It should be added buffer-locally to `kill-buffer-hook'."
-  (whitespace-action)
+  (whitespace-action t)
   nil)                                 ; continue hook processing
 
 
-(defun whitespace-action ()
+(defun whitespace-action (&optional is-killing-buffer)
   "Action to be taken when buffer is killed or written.
 Return t when the action should be aborted."
   (cond ((memq 'auto-cleanup whitespace-action)
-        (whitespace-cleanup)
+        (unless is-killing-buffer
+          (whitespace-cleanup))
         nil)
        ((memq 'abort-on-bogus whitespace-action)
         (whitespace-report nil t))