X-Git-Url: http://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Fgnus-mh.el;h=35ee140b5b7c8d3ddd67d1699ac628bc47a354ea;hb=7743919c94113c668a09e272a91b309b9ba5d5a9;hp=4002ea10f33b8799d558adc81b6fae0a19380e80;hpb=48bc94c8a55fd8d5f6870c93d7c7bfa19abb34db;p=gnus

diff --git a/lisp/gnus-mh.el b/lisp/gnus-mh.el
index 4002ea10f..35ee140b5 100644
--- a/lisp/gnus-mh.el
+++ b/lisp/gnus-mh.el
@@ -1,8 +1,9 @@
 ;;; gnus-mh.el --- mh-e interface for Gnus
-;; Copyright (C) 1994,95,96 Free Software Foundation, Inc.
+;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000
+;;        Free Software Foundation, Inc.
 
 ;; Author: Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
-;;	Lars Magne Ingebrigtsen <larsi@ifi.uio.no>
+;;	Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
 
 ;; This file is part of GNU Emacs.
@@ -39,6 +40,9 @@
 (require 'gnus-msg)
 (require 'gnus-sum)
 
+(eval-when-compile
+  (defvar mh-lib-progs))
+
 (defun gnus-summary-save-article-folder (&optional arg)
   "Append the current article to an mh folder.
 If N is a positive number, save the N next articles.
@@ -46,6 +50,7 @@ If N is a negative number, save the N previous articles.
 If N is nil and any articles have been marked with the process mark,
 save those articles instead."
   (interactive "P")
+  (require 'gnus-art)
   (let ((gnus-default-article-saver 'gnus-summary-save-in-folder))
     (gnus-summary-save-article arg)))
 
@@ -59,19 +64,23 @@ Optional argument FOLDER specifies folder name."
 		     gnus-newsgroup-last-folder)
 		gnus-newsgroup-last-folder)
 	       (folder folder)
-	       (t (mh-prompt-for-folder 
+	       (t (mh-prompt-for-folder
 		   "Save article in"
 		   (funcall gnus-folder-save-name gnus-newsgroup-name
 			    gnus-current-headers gnus-newsgroup-last-folder)
 		   t))))
-	(errbuf (get-buffer-create " *Gnus rcvstore*"))
+	(errbuf (gnus-get-buffer-create " *Gnus rcvstore*"))
 	;; Find the rcvstore program.
-	(exec-path (if mh-lib (cons mh-lib exec-path) exec-path)))
-    (gnus-eval-in-buffer-window gnus-original-article-buffer
+	(exec-path (cond
+		    ((and (boundp 'mh-lib-progs) mh-lib-progs)
+		     (cons mh-lib-progs exec-path))
+		    (mh-lib (cons mh-lib exec-path))
+		    (t exec-path))))
+    (with-current-buffer gnus-original-article-buffer
       (save-restriction
 	(widen)
 	(unwind-protect
-	    (call-process-region 
+	    (call-process-region
 	     (point-min) (point-max) "rcvstore" nil errbuf nil folder)
 	  (set-buffer errbuf)
 	  (if (zerop (buffer-size))