Merge from gnus--rel--5.10

[gnu-emacs] / lisp / add-log.el

diff --git a/lisp/add-log.el b/lisp/add-log.el
index b47494194d48c7657dc8aa5391ea9348d662e21f..393a696d3f1efe8deeb3ba65135186dcaccf0c6a 100644 (file)
--- a/lisp/add-log.el
+++ b/lisp/add-log.el
@@ -45,8 +45,7 @@
   :type '(choice (const :tag "default" nil)
                 string)
   :group 'change-log)
-(put 'change-log-default-name 'safe-local-variable
-     (lambda (a) (or (stringp a) (null a))))
+(put 'change-log-default-name 'safe-local-variable 'string-or-null-p)
 
 (defcustom change-log-mode-hook nil
   "Normal hook run by `change-log-mode'."
@@ -295,7 +294,7 @@ It takes the same format as the TZ argument of `set-time-zone-rule'.
 If nil, use local time.
 If t, use universal time.")
 
-(defun add-log-iso8601-time-zone (time)
+(defun add-log-iso8601-time-zone (&optional time)
   (let* ((utc-offset (or (car (current-time-zone time)) 0))
         (sign (if (< utc-offset 0) ?- ?+))
         (sec (abs utc-offset))
@@ -311,7 +310,8 @@ If t, use universal time.")
 (defvar add-log-iso8601-with-time-zone nil)
 
 (defun add-log-iso8601-time-string ()
-  (let ((time (format-time-string "%Y-%m-%d" (eq t add-log-time-zone-rule))))
+  (let ((time (format-time-string "%Y-%m-%d"
+                                  nil (eq t add-log-time-zone-rule))))
     (if add-log-iso8601-with-time-zone
         (concat time " " (add-log-iso8601-time-zone))
       time)))