From bbc83e237baccfc86cb1070ed63fec1ecccefe5b Mon Sep 17 00:00:00 2001 From: yamaoka Date: Sat, 18 Jan 2003 13:11:39 +0000 Subject: [PATCH] Synch with Oort Gnus. --- lisp/ChangeLog | 13 +++++++++++++ lisp/gnus-art.el | 14 ++++++++------ lisp/gnus-sum.el | 4 +++- lisp/nnmail.el | 4 +++- 4 files changed, 27 insertions(+), 8 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 9b2c2ee..56ccd95 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,16 @@ +2003-01-18 Kai Gro,A_(Bjohann + + * nnmail.el (nnmail-process-unix-mail-format): Improve error + message. Suggested by Jari Aalto. + +2003-01-17 Lars Magne Ingebrigtsen + + * gnus-art.el (gnus-article-followup-with-original): Clean up. + (gnus-article-reply-with-original): Ditto. + + * gnus-sum.el (gnus-summary-catchup): Make sure downloadable, + read articles don't become unread. + 2003-01-17 Simon Josefsson * gnus-fun.el (gnus-x-face-from-file): diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el index 086c0f6..d307757 100644 --- a/lisp/gnus-art.el +++ b/lisp/gnus-art.el @@ -5380,36 +5380,38 @@ Argument LINES specifies lines to be scrolled down." The text in the region will be yanked. If the region isn't active, the entire article will be yanked." (interactive "P") - (let ((article (cdr gnus-article-current)) cont) + (let ((article (cdr gnus-article-current)) + contents) (if (not (gnus-mark-active-p)) (with-current-buffer gnus-summary-buffer (gnus-summary-reply (list (list article)) wide)) - (setq cont (buffer-substring (point) (mark t))) + (setq contents (buffer-substring (point) (mark t))) ;; Deactivate active regions. (when (and (boundp 'transient-mark-mode) transient-mark-mode) (setq mark-active nil)) (with-current-buffer gnus-summary-buffer (gnus-summary-reply - (list (list article cont)) wide))))) + (list (list article contents)) wide))))) (defun gnus-article-followup-with-original () "Compose a followup to the current article. The text in the region will be yanked. If the region isn't active, the entire article will be yanked." (interactive) - (let ((article (cdr gnus-article-current)) cont) + (let ((article (cdr gnus-article-current)) + contents) (if (not (gnus-mark-active-p)) (with-current-buffer gnus-summary-buffer (gnus-summary-followup (list (list article)))) - (setq cont (buffer-substring (point) (mark t))) + (setq contents (buffer-substring (point) (mark t))) ;; Deactivate active regions. (when (and (boundp 'transient-mark-mode) transient-mark-mode) (setq mark-active nil)) (with-current-buffer gnus-summary-buffer (gnus-summary-followup - (list (list article cont))))))) + (list (list article contents))))))) (defun gnus-article-hide (&optional arg force) "Hide all the gruft in the current article. diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el index e6d72c8..539745e 100644 --- a/lisp/gnus-sum.el +++ b/lisp/gnus-sum.el @@ -10078,7 +10078,9 @@ The number of articles marked as read is returned." (setq gnus-newsgroup-marked nil gnus-newsgroup-spam-marked nil gnus-newsgroup-dormant nil)) - (setq gnus-newsgroup-unreads gnus-newsgroup-downloadable)) + (setq gnus-newsgroup-unreads + (gnus-intersection gnus-newsgroup-unreads + gnus-newsgroup-downloadable))) ;; We actually mark all articles as canceled, which we ;; have to do when using auto-expiry or adaptive scoring. (gnus-summary-show-all-threads) diff --git a/lisp/nnmail.el b/lisp/nnmail.el index 32d38af..b8d4de3 100644 --- a/lisp/nnmail.el +++ b/lisp/nnmail.el @@ -787,7 +787,9 @@ If SOURCE is a directory spec, try to return the group name component." (if (not (and (re-search-forward "^From " nil t) (goto-char (match-beginning 0)))) ;; Possibly wrong format? - (error "Error, unknown mail format! (Possibly corrupted.)") + (error "Error, unknown mail format! (Possibly corrupted %s `%s'.)" + (if (buffer-file-name) "file" "buffer") + (or (buffer-file-name) (buffer-name))) ;; Carry on until the bitter end. (while (not (eobp)) (setq start (point) -- 1.7.10.4