X-Git-Url: http://cgit.sxemacs.org/?p=gnus;a=blobdiff_plain;f=lisp%2Fgnus-mh.el;h=874a1dc3bb42aeb45308a3117010a6c01abca41c;hp=1474b6fae0602632525760a43f4b93cfafadc17f;hb=789c31bee0f2558e907a9d174afae38fc44092d6;hpb=4ed642287546d6ec096d029e578ff1ccb375f0d2

diff --git a/lisp/gnus-mh.el b/lisp/gnus-mh.el
index 1474b6fae..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 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,8 +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, 675 Mass Ave, Cambridge, MA 02139, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -32,10 +32,13 @@
 
 ;;; Code:
 
+(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.
@@ -44,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)))
 
@@ -57,38 +61,31 @@ 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*")))
-    (gnus-eval-in-buffer-window 
-     gnus-article-buffer
-     (save-restriction
-       (widen)
-       (unwind-protect
-	   (call-process-region (point-min) (point-max)
-				(expand-file-name "rcvstore" mh-lib)
-				nil errbuf nil folder)
-	 (set-buffer errbuf)
-	 (if (zerop (buffer-size))
-	     (message "Article saved in folder: %s" folder)
-	   (message "%s" (buffer-string)))
-	 (kill-buffer errbuf))))
+	(errbuf (gnus-get-buffer-create " *Gnus rcvstore*"))
+	;; Find the rcvstore program.
+	(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
+	     (point-min) (point-max) "rcvstore" nil errbuf nil folder)
+	  (set-buffer errbuf)
+	  (if (zerop (buffer-size))
+	      (message "Article saved in folder: %s" folder)
+	    (message "%s" (buffer-string)))
+	  (kill-buffer errbuf))))
     (setq gnus-newsgroup-last-folder folder)))
 
-(defun gnus-mh-mail-setup (to subject in-reply-to cc replybuffer actions)
-  (let ((config (current-window-configuration))) 
-    (setq mh-show-buffer gnus-article-copy)
-    (mh-find-path)
-    (mh-send-sub (or to "") (or cc "") (or subject "(None)") config)
-    (goto-char (point-min))
-    (insert "In-Reply-To: " in-reply-to "\n")
-    (setq mh-sent-from-folder gnus-article-copy)
-    (setq mh-sent-from-msg 1)
-    (setq mh-previous-window-config config)))
-
 (defun gnus-Folder-save-name (newsgroup headers &optional last-folder)
   "Generate folder name from NEWSGROUP, HEADERS, and optional LAST-FOLDER.
 If variable `gnus-use-long-file-name' is nil, it is +News.group.
@@ -109,4 +106,6 @@ Otherwise, it is like +news/group."
 		  newsgroup
 		(gnus-newsgroup-directory-form newsgroup)))))
 
+(provide 'gnus-mh)
+
 ;;; gnus-mh.el ends here