Don't clean up a buffer when killing it.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3e75e2a720a98ebc5a5015aa48c06ae2471ad70a..2bdab884b9388ab60ebd201bc42ce7ba2dd325c1 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -40,6 +40,11 @@
        in a highlighted region: indent each line in region according to
        mode.  Supply this so it works in XEmacs and older Emacs.
 
+2008-09-05  Vinicius Jose Latorre  <viniciusjl@ig.com.br>
+
+       * whitespace.el (whitespace-kill-buffer-hook, whitespace-action): Don't
+       clean up a buffer when killing it.
+
 2008-09-05  Vinicius Jose Latorre  <viniciusjl@ig.com.br>
 
        * whitespace.el: Fix auto-cleanup on kill prevents killing read-only

diff --git a/lisp/whitespace.el b/lisp/whitespace.el
index 59da0469be396ce6b206ea7f174d1562ecf1854b..56d4e58f1385601e8b6d751e0ed2b1fdacd63dcc 100644 (file)
--- a/lisp/whitespace.el
+++ b/lisp/whitespace.el
@@ -2403,15 +2403,16 @@ It should be added buffer-locally to `write-file-functions'."
 (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))