From e611ec1d790876867950424a502b5ff1d75dfb86 Mon Sep 17 00:00:00 2001 From: yamaoka Date: Tue, 9 Jan 2001 08:55:25 +0000 Subject: [PATCH] Synch with Oort Gnus. --- lisp/ChangeLog | 11 +++++++++++ lisp/gnus-art.el | 38 +++++++++++++++++++++----------------- lisp/gnus-sum.el | 5 ++++- lisp/mm-decode.el | 2 +- lisp/nnmail.el | 2 +- 5 files changed, 38 insertions(+), 20 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b1ce117..f5b1034 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,14 @@ +2001-01-09 01:00:00 ShengHuo ZHU + + * mm-decode.el (mm-interactively-view-part): Don't copy-sequence + handle. + * gnus-art.el (gnus-mime-view-part): Copy it. + (gnus-mime-view-part-as-type): Add into gnus-article-mime-handles. + +2001-01-09 Michael Downes + + * gnus-sum.el (gnus-summary-read-group-1): More useful message. + 2001-01-08 23:00:00 ShengHuo ZHU * nnmail.el (nnmail-get-new-mail): Find group only if file is not diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el index fef33f3..1430aa9 100644 --- a/lisp/gnus-art.el +++ b/lisp/gnus-art.el @@ -3654,6 +3654,7 @@ value of the variable `gnus-show-mime' is non-nil." (gnus-article-check-buffer) (let ((data (get-text-property (point) 'gnus-data))) (when data + (push (setq data (copy-sequence data)) gnus-article-mime-handles) (mm-interactively-view-part data)))) (defun gnus-mime-view-part-as-type-internal () @@ -3664,27 +3665,30 @@ value of the variable `gnus-show-mime' is non-nil." (def-type (and name (mm-default-file-encoding name)))) (and def-type (cons def-type 0)))) -(defun gnus-mime-view-part-as-type (mime-type) +(defun gnus-mime-view-part-as-type (&optional mime-type) "Choose a MIME media type, and view the part as such." - (interactive - (list (completing-read - "View as MIME type: " - (mapcar #'list (mailcap-mime-types)) - nil nil - (gnus-mime-view-part-as-type-internal)))) + (interactive) + (unless mime-type + (setq mime-type (completing-read + "View as MIME type: " + (mapcar #'list (mailcap-mime-types)) + nil nil + (gnus-mime-view-part-as-type-internal)))) (gnus-article-check-buffer) (let ((handle (get-text-property (point) 'gnus-data))) (when handle - (gnus-mm-display-part - (mm-make-handle (mm-handle-buffer handle) - (cons mime-type (cdr (mm-handle-type handle))) - (mm-handle-encoding handle) - (mm-handle-undisplayer handle) - (mm-handle-disposition handle) - (mm-handle-description handle) - (mm-handle-cache handle) - (mm-handle-id handle)))))) - + (setq handle + (mm-make-handle (mm-handle-buffer handle) + (cons mime-type (cdr (mm-handle-type handle))) + (mm-handle-encoding handle) + (mm-handle-undisplayer handle) + (mm-handle-disposition handle) + (mm-handle-description handle) + (mm-handle-cache handle) + (mm-handle-id handle))) + (push handle gnus-article-mime-handles) + (gnus-mm-display-part handle)))) + (defun gnus-mime-copy-part (&optional handle) "Put the the MIME part under point into a new buffer." (interactive) diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el index 9c165f9..86366ae 100644 --- a/lisp/gnus-sum.el +++ b/lisp/gnus-sum.el @@ -3004,7 +3004,10 @@ If SHOW-ALL is non-nil, already read articles are also listed." (gnus-group-jump-to-group group) (gnus-group-next-unread-group 1)) (gnus-handle-ephemeral-exit quit-config))) - (gnus-message 3 "Can't select group") + (let ((grpinfo (gnus-get-info group))) + (if (null (gnus-info-read grpinfo)) + (gnus-message 3 "Group %s contains no messages" group) + (gnus-message 3 "Can't select group"))) nil) ;; The user did a `C-g' while prompting for number of articles, ;; so we exit this group. diff --git a/lisp/mm-decode.el b/lisp/mm-decode.el index 4335103..ffc8aea 100644 --- a/lisp/mm-decode.el +++ b/lisp/mm-decode.el @@ -842,7 +842,7 @@ external if displayed external." (error "No method given")) (if (string-match "^[^% \t]+$" method) (setq method (concat method " %s"))) - (mm-display-external (copy-sequence handle) method))) + (mm-display-external handle method))) (defun mm-preferred-alternative (handles &optional preferred) "Say which of HANDLES are preferred." diff --git a/lisp/nnmail.el b/lisp/nnmail.el index b40f1fe..1510d4a 100644 --- a/lisp/nnmail.el +++ b/lisp/nnmail.el @@ -1585,7 +1585,7 @@ See the documentation for the variable `nnmail-split-fancy' for documentation." ',spool-func (if (equal file orig-file) nil - (nnmail-get-split-group orig-file ,source)) + (nnmail-get-split-group orig-file ',source)) ',(intern (format "%s-active-number" method)))))) (incf total new) (incf i))) -- 1.7.10.4