[Emacs-diffs] Changes to emacs/lisp/gnus/gnus-art.el,v

[Miles Bader]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Miles Bader <miles>     08/08/07 07:18:08

Index: lisp/gnus/gnus-art.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/gnus/gnus-art.el,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -b -r1.165 -r1.166
--- lisp/gnus/gnus-art.el       26 Jul 2008 09:13:11 -0000      1.165
+++ lisp/gnus/gnus-art.el       7 Aug 2008 07:18:07 -0000       1.166
@@ -3955,28 +3955,14 @@
     last used for saving.
 Non-nil value for RAW overrides `:decode' and `:headers' properties
 and the raw article including all headers will be piped."
-  (let ((save-buffer gnus-save-article-buffer)
-       (default (or gnus-summary-pipe-output-default-command
-                    gnus-last-shell-command)))
-    ;; `gnus-save-article-buffer' should be a buffer containing the article
-    ;; contents if this function is called by way of the command
-    ;; `gnus-summary-pipe-output'.  OTOH, that the buffer does not exist
-    ;; means this function is called independently.
-    (unless (gnus-buffer-live-p save-buffer)
       (let ((article (gnus-summary-article-number))
            (decode (unless raw
-                     (get 'gnus-summary-save-in-pipe :decode))))
+                 (get 'gnus-summary-save-in-pipe :decode)))
+       save-buffer default)
        (if article
            (if (vectorp (gnus-summary-article-header article))
-               (save-window-excursion
-                 (let ((gnus-display-mime-function
-                        (when decode
-                          gnus-display-mime-function))
-                       (gnus-article-prepare-hook
-                        (when decode
-                          gnus-article-prepare-hook)))
-                   (gnus-summary-select-article t t nil article)
-                   (gnus-summary-goto-subject article))
+           (save-current-buffer
+             (gnus-summary-select-article decode decode nil article)
                  (insert-buffer-substring
                   (prog1
                       (if decode
@@ -3995,19 +3981,14 @@
                          (gnus-summary-buffer nil))
                      (article-hide-headers 1 t))))
              (error "%d is not a real article" article))
-         (error "No article to pipe"))))
+      (error "No article to pipe"))
+    (setq default (or gnus-summary-pipe-output-default-command
+                     gnus-last-shell-command))
     (unless (stringp command)
       (setq command
            (if (and (eq command 'default) default)
                default
-             (gnus-read-shell-command
-              (format
-               "Shell command on %s: "
-               (if (and gnus-number-of-articles-to-be-saved
-                        (> gnus-number-of-articles-to-be-saved 1))
-                   (format "these %d articles"
-                           gnus-number-of-articles-to-be-saved)
-                 "this article"))
+             (gnus-read-shell-command "Shell command on this article: "
               default))))
     (when (string-equal command "")
       (if default