summaryrefslogtreecommitdiff
path: root/lisp/net/pop3.el
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2019-08-01 15:34:35 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2019-08-01 15:47:15 -0700
commitfbd2ea1f73f3262636efacfe77ad33dc8a4d826f (patch)
tree53387c8bf1efe425dd0a0cc90330cebed405805d /lisp/net/pop3.el
parent24b60b75ea544f0c2df740d40592c6665c123523 (diff)
downloademacs-fbd2ea1f73f3262636efacfe77ad33dc8a4d826f.tar.gz
emacs-fbd2ea1f73f3262636efacfe77ad33dc8a4d826f.tar.bz2
emacs-fbd2ea1f73f3262636efacfe77ad33dc8a4d826f.zip
Fix two parse-time-months invalid assumptions
* lisp/gnus/nnimap.el: Do not require parse-time. * lisp/gnus/nnimap.el (nnimap-find-expired-articles): * lisp/net/pop3.el (pop3-make-date): Just use system-time-locale and format-time-string; no need to refer to parse-time-months. * lisp/net/pop3.el (parse-time-months): Remove defvar. * lisp/net/tramp-smb.el (tramp-smb-read-file-entry): Add FIXME comment about this.
Diffstat (limited to 'lisp/net/pop3.el')
-rw-r--r--lisp/net/pop3.el16
1 files changed, 3 insertions, 13 deletions
diff --git a/lisp/net/pop3.el b/lisp/net/pop3.el
index ddb4139610e..4bf50c0d226 100644
--- a/lisp/net/pop3.el
+++ b/lisp/net/pop3.el
@@ -35,7 +35,6 @@
(eval-when-compile (require 'cl-lib))
(require 'mail-utils)
-(defvar parse-time-months)
(defgroup pop3 nil
"Post Office Protocol."
@@ -609,18 +608,9 @@ Return the response string if optional second argument is non-nil."
(defun pop3-make-date (&optional now)
"Make a valid date header.
If NOW, use that time instead."
- (require 'parse-time)
- (let* ((now (or now (current-time)))
- (zone (decoded-time-zone (decode-time now))))
- (when (< zone 0)
- (setq zone (- zone)))
- (concat
- (format-time-string "%d" now)
- ;; The month name of the %b spec is locale-specific. Pfff.
- (format " %s "
- (capitalize (car (rassoc (decoded-time-month (decode-time now))
- parse-time-months))))
- (format-time-string "%Y %H:%M:%S %z" now))))
+ ;; The month name of the %b spec is locale-specific. Pfff.
+ (let ((system-time-locale "C"))
+ (format-time-string "%d %b %Y %T %z" now)))
(defun pop3-munge-message-separator (start end)
"Check to see if a message separator exists. If not, generate one."