X-Git-Url: http://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Fgnus-mh.el;h=874a1dc3bb42aeb45308a3117010a6c01abca41c;hb=873ba7b51ddfb07246cd874b7de72662308236c9;hp=94f2ac0f5a5db44357fc385e8ead85d65a35fe30;hpb=8f22dc3866405e2211e7d6201491100371c3cd9a;p=gnus

diff --git a/lisp/gnus-mh.el b/lisp/gnus-mh.el
index 94f2ac0f5..874a1dc3b 100644
--- a/lisp/gnus-mh.el
+++ b/lisp/gnus-mh.el
@@ -1,16 +1,17 @@
 ;;; gnus-mh.el --- mh-e interface for Gnus
-;; Copyright (C) 1994,95,96 Free Software Foundation, Inc.
+
+;; Copyright (C) 1994-2012 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.
 
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; GNU Emacs is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -18,9 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -33,13 +32,14 @@
 
 ;;; Code:
 
-(require 'gnus-load)
+(require 'gnus)
 (require 'mh-e)
 (require 'mh-comp)
-(require 'gnus)
 (require 'gnus-msg)
 (require 'gnus-sum)
 
+(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.
@@ -47,6 +47,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)))
 
@@ -60,19 +61,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))