diff options
Diffstat (limited to 'lisp/gnus')
| -rw-r--r-- | lisp/gnus/ChangeLog | 8 | ||||
| -rw-r--r-- | lisp/gnus/gnus-util.el | 11 | ||||
| -rw-r--r-- | lisp/gnus/nntp.el | 6 |
3 files changed, 15 insertions, 10 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 26740da73df..7d1e7ed7198 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,11 @@ +2011-07-01 Paul Eggert <eggert@cs.ucla.edu> + + * nntp.el (nntp-record-command): + * gnus-util.el (gnus-message-with-timestamp-1): + Use format-time-string rather than decoding time stamps by hand. + This is simpler and insulates the code from potential changes to + current-time format. + 2011-07-01 Katsumi Yamaoka <yamaoka@jpl.org> * gnus-draft.el (gnus-draft-clear-marks): Mark deleted articles as read. diff --git a/lisp/gnus/gnus-util.el b/lisp/gnus/gnus-util.el index 3f66b45aaab..7155c7f9607 100644 --- a/lisp/gnus/gnus-util.el +++ b/lisp/gnus/gnus-util.el @@ -540,8 +540,7 @@ but also to the ones displayed in the echo area." (eval-when-compile (defmacro gnus-message-with-timestamp-1 (format-string args) - (let ((timestamp '((format-time-string "%Y%m%dT%H%M%S" time) - "." (format "%03d" (/ (nth 2 time) 1000)) "> "))) + (let ((timestamp '(format-time-string "%Y%m%dT%H%M%S.%3N> " time))) (if (featurep 'xemacs) `(let (str time) (if (or (and (null ,format-string) (null ,args)) @@ -554,10 +553,10 @@ but also to the ones displayed in the echo area." (cond ((eq gnus-add-timestamp-to-message 'log) (setq time (current-time)) (display-message 'no-log str) - (log-message 'message (concat ,@timestamp str))) + (log-message 'message (concat ,timestamp str))) (gnus-add-timestamp-to-message (setq time (current-time)) - (display-message 'message (concat ,@timestamp str))) + (display-message 'message (concat ,timestamp str))) (t (display-message 'message str)))) str) @@ -571,7 +570,7 @@ but also to the ones displayed in the echo area." (setq time (current-time)) (with-current-buffer (get-buffer-create "*Messages*") (goto-char (point-max)) - (insert ,@timestamp str "\n") + (insert ,timestamp str "\n") (forward-line (- message-log-max)) (delete-region (point-min) (point)) (goto-char (point-max)))) @@ -585,7 +584,7 @@ but also to the ones displayed in the echo area." (and ,format-string str) (message nil)) (setq time (current-time)) - (message "%s" (concat ,@timestamp str)) + (message "%s" (concat ,timestamp str)) str)) (t (apply 'message ,format-string ,args)))))))) diff --git a/lisp/gnus/nntp.el b/lisp/gnus/nntp.el index a8ffc6576ca..986fd51a613 100644 --- a/lisp/gnus/nntp.el +++ b/lisp/gnus/nntp.el @@ -338,10 +338,8 @@ backend doesn't catch this error.") "Record the command STRING." (with-current-buffer (get-buffer-create "*nntp-log*") (goto-char (point-max)) - (let ((time (current-time))) - (insert (format-time-string "%Y%m%dT%H%M%S" time) - "." (format "%03d" (/ (nth 2 time) 1000)) - " " nntp-address " " string "\n")))) + (insert (format-time-string "%Y%m%dT%H%M%S.%3N") + " " nntp-address " " string "\n"))) (defun nntp-report (&rest args) "Report an error from the nntp backend. The first string in ARGS |