* lisp/files.el (safe-local-eval-forms): Fix before-save-hook entry to be

buffer-local; add delete-trailing-whitespace.

Fixes: debbugs:12259

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6122c0b0f8d000713786118cd2bf07f9c88b45f3..95d920b32ec292e15a341519c667a8b220405deb 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-08-23  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * files.el (safe-local-eval-forms): Fix before-save-hook entry to be
+       buffer-local; add delete-trailing-whitespace (bug#12259).
+
 2012-08-22  Jeremy Moore  <jmoore@ieee.org>  (tiny change)
 
        * progmodes/hideif.el (hif-compress-define-list):

diff --git a/lisp/files.el b/lisp/files.el
index 02c9e04311ea15f3d8d51adc19d46537dc427250..5f83639d9cf6aee26a7b3f0ce5bbf72d85212ba7 100644 (file)
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -2842,7 +2842,8 @@ symbol and VAL is a value that is considered safe."
   ;; This should be here at least as long as Emacs supports write-file-hooks.
   '((add-hook 'write-file-hooks 'time-stamp)
     (add-hook 'write-file-functions 'time-stamp)
-    (add-hook 'before-save-hook 'time-stamp))
+    (add-hook 'before-save-hook 'time-stamp nil t)
+    (add-hook 'before-save-hook 'delete-trailing-whitespace nil t))
   "Expressions that are considered safe in an `eval:' local variable.
 Add expressions to this list if you want Emacs to evaluate them, when
 they appear in an `eval' local variable specification, without first