summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorReiner Steib <Reiner.Steib@gmx.de>2006-11-05 19:29:02 +0000
committerReiner Steib <Reiner.Steib@gmx.de>2006-11-05 19:29:02 +0000
commitd52c204b13ded3a143f418264da06865c4f1132c (patch)
treebd49682d63d5b15be60f8f19a0c7f279ba1a43dc /lisp
parent89723b88b60ac7b7da19b7baab2ef6faeee7ece4 (diff)
downloademacs-d52c204b13ded3a143f418264da06865c4f1132c.tar.gz
emacs-d52c204b13ded3a143f418264da06865c4f1132c.tar.bz2
emacs-d52c204b13ded3a143f418264da06865c4f1132c.zip
(add-log-time-zone-rule): Mark as safe-local-variable.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/add-log.el2
2 files changed, 6 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ea0736357f5..adde4eb180f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2006-11-05 Reiner Steib <Reiner.Steib@gmx.de>
+
+ * add-log.el (add-log-time-zone-rule): Mark as safe-local-variable.
+
2006-11-05 Chong Yidong <cyd@stupidchicken.com>
* startup.el (command-line-1): Kill emacs if the last frame is
diff --git a/lisp/add-log.el b/lisp/add-log.el
index d60f920244a..a1208d5fdd6 100644
--- a/lisp/add-log.el
+++ b/lisp/add-log.el
@@ -293,6 +293,8 @@ Note: The search is conducted only within 10%, at the beginning of the file."
It takes the same format as the TZ argument of `set-time-zone-rule'.
If nil, use local time.
If t, use universal time.")
+(put 'add-log-time-zone-rule 'safe-local-variable
+ '(lambda (x) (or (booleanp x) (stringp x))))
(defun add-log-iso8601-time-zone (&optional time)
(let* ((utc-offset (or (car (current-time-zone time)) 0))