From 84f0e93eff2f8b93ab0896eb02fcef85f191743a Mon Sep 17 00:00:00 2001 From: yamaoka Date: Thu, 21 Jun 2001 23:00:52 +0000 Subject: [PATCH] Synch with Oort Gnus. --- lisp/ChangeLog | 16 ++++++++++++++++ lisp/gnus-msg.el | 4 ++-- lisp/message.el | 5 +++-- lisp/nnultimate.el | 39 ++++++++++++++++++++------------------- 4 files changed, 41 insertions(+), 23 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f3e777a..4b9dc15 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,19 @@ +2001-06-21 10:00:00 ShengHuo ZHU + From Fremlin + + * message.el (message-goto-body): Some messages have no header. + + * gnus-msg.el (gnus-copy-article-buffer): Use it. + +2001-06-21 Ralph Schleicher + + * nnultimate.el (nnultimate-retrieve-headers): Date fix. + +2001-06-21 10:00:00 ShengHuo ZHU + + * message.el (message-make-date): Add week day. + Suggested by Jason R. Mastaler . + 2001-06-19 Simon Josefsson * message.el (message-yank-prefix): Doc fix. diff --git a/lisp/gnus-msg.el b/lisp/gnus-msg.el index 1627f27..c2604bd 100644 --- a/lisp/gnus-msg.el +++ b/lisp/gnus-msg.el @@ -578,11 +578,11 @@ header line with the old Message-ID." (while (looking-at message-unix-mail-delimiter) (forward-line 1)) (setq beg (point)) - (setq end (or (search-forward "\n\n" nil t) (point))) + (setq end (or (message-goto-body) point)) ;; Delete the headers from the displayed articles. (set-buffer gnus-article-copy) (delete-region (goto-char (point-min)) - (or (search-forward "\n\n" nil t) (point-max))) + (or (message-goto-body) (point-max))) ;; Insert the original article headers. (insert-buffer-substring gnus-original-article-buffer beg end) (article-decode-encoded-words)))) diff --git a/lisp/message.el b/lisp/message.el index 35764ac..72487e3 100644 --- a/lisp/message.el +++ b/lisp/message.el @@ -2139,7 +2139,8 @@ a string \"never\" is inserted in default." (expand-abbrev)) (goto-char (point-min)) (or (search-forward (concat "\n" mail-header-separator "\n") nil t) - (search-forward "\n\n" nil t))) + (search-forward-regexp "[^:]+:\\([^\n]\\|\n[ \t]\\)+\n\n" nil t) + (point-min))) (defun message-goto-eoh () "Move point to the end of the headers." @@ -3963,7 +3964,7 @@ If NOW, use that time instead." (setq sign "-") (setq zone (- zone))) (concat - (format-time-string "%d" now) + (format-time-string "%a, %d" now) ;; The month name of the %b spec is locale-specific. Pfff. (format " %s " (capitalize (car (rassoc (nth 4 (decode-time now)) diff --git a/lisp/nnultimate.el b/lisp/nnultimate.el index 3f69d36..cd784d6 100644 --- a/lisp/nnultimate.el +++ b/lisp/nnultimate.el @@ -173,25 +173,26 @@ (setq date (substring (car datel) (match-end 0)) datel nil)) (pop datel)) - (setq date (delete "" (split-string - date "[-, \n\t\r    ]"))) - (if (or (member "AM" date) - (member "PM" date)) - (setq date (format - "%s %s %s %s" - (nth 1 date) - (if (and (>= (length (nth 0 date)) 3) - (assoc (downcase - (substring (nth 0 date) 0 3)) - parse-time-months)) - (substring (nth 0 date) 0 3) - (car (rassq (string-to-number (nth 0 date)) - parse-time-months))) - (nth 2 date) (nth 3 date))) - (setq date (format "%s %s %s %s" - (car (rassq (string-to-number (nth 1 date)) - parse-time-months)) - (nth 0 date) (nth 2 date) (nth 3 date)))) + (when date + (setq date (delete "" (split-string + date "[-, \n\t\r    ]"))) + (if (or (member "AM" date) + (member "PM" date)) + (setq date (format + "%s %s %s %s" + (nth 1 date) + (if (and (>= (length (nth 0 date)) 3) + (assoc (downcase + (substring (nth 0 date) 0 3)) + parse-time-months)) + (substring (nth 0 date) 0 3) + (car (rassq (string-to-number (nth 0 date)) + parse-time-months))) + (nth 2 date) (nth 3 date))) + (setq date (format "%s %s %s %s" + (car (rassq (string-to-number (nth 1 date)) + parse-time-months)) + (nth 0 date) (nth 2 date) (nth 3 date))))) (push (cons article -- 1.7.10.4