2 files changed, 8 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cf8cf16e0ca..643d658ee89 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2009-09-25  Juri Linkov  <juri@jurta.org>
+
+        * files.el (safe-local-eval-forms): Allow time-stamp in
+        before-save-hook (Bug#4554).
+
 2009-09-25  Drew Adams  <drew.adams@oracle.com>
 
         * menu-bar.el (list-buffers-directory): Doc fix.
diff --git a/lisp/files.el b/lisp/files.el
index 6e3fe605025..177046ace0f 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -2687,7 +2687,9 @@ symbol and VAL is a value that is considered safe."
   :group 'find-file
   :type 'alist)
 
-(defcustom safe-local-eval-forms '((add-hook 'write-file-hooks 'time-stamp))
+(defcustom safe-local-eval-forms
+  '((add-hook 'write-file-functions 'time-stamp)
+    (add-hook 'before-save-hooks 'time-stamp))
   "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