(gnus-dribble-read-file): Quote file-precious-flag.

[gnus] / lisp / gnus-mh.el

diff --git a/lisp/gnus-mh.el b/lisp/gnus-mh.el
index 6cb7671..cc36aa6 100644 (file)
--- a/lisp/gnus-mh.el
+++ b/lisp/gnus-mh.el
@@ -1,8 +1,10 @@
 ;;; gnus-mh.el --- mh-e interface for Gnus
-;; Copyright (C) 1994,95 Free Software Foundation, Inc.
+
+;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2002, 2003,
+;;   2004, 2005 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.
@@ -18,8 +20,9 @@
 ;; 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; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
@@ -32,10 +35,14 @@
 
 ;;; Code:
 
+(require 'gnus)
 (require 'mh-e)
 (require 'mh-comp)
-(require 'gnus)
 (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.
@@ -44,6 +51,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,66 +65,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-original-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 "") config)
-    (goto-char (point-min))
-    (and in-reply-to (insert "In-Reply-To: " in-reply-to "\n"))
-    (setq mh-sent-from-folder gnus-article-copy)
-    (setq mh-sent-from-msg 1)
-    (setq gnus-mail-buffer (buffer-name (current-buffer)))
-    (local-set-key "\C-c\C-c" 'gnus-mh-mail-send-and-exit)
-    (setq mh-previous-window-config config)))
-
-(defun gnus-mh-mail-send-and-exit (&optional dont-send)
-  "Send the current mail and return to Gnus."
-  (interactive)
-  (let* ((reply gnus-article-reply)
-        (winconf gnus-prev-winconf)
-        (address-group gnus-add-to-address)
-        (to-address (and address-group
-                         (mail-fetch-field "to"))))
-    (setq gnus-add-to-address nil)
-    (or dont-send (mh-send-letter))
-    (bury-buffer)
-    ;; This mail group doesn't have a `to-address', so we add one
-    ;; here.  Magic!  
-    (and to-address
-        (gnus-group-add-parameter 
-         address-group (cons 'to-address to-address)))
-    (if (get-buffer gnus-group-buffer)
-       (progn
-         (if (gnus-buffer-exists-p (car-safe reply))
-             (progn
-               (set-buffer (car reply))
-               (and (cdr reply)
-                    (gnus-summary-mark-article-as-replied 
-                     (cdr reply)))))
-         (and winconf (set-window-configuration winconf))))))
-
 (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.
@@ -137,4 +110,7 @@ Otherwise, it is like +news/group."
                  newsgroup
                (gnus-newsgroup-directory-form newsgroup)))))
 
+(provide 'gnus-mh)
+
+;;; arch-tag: 2d5696d3-b363-48e5-8749-c256be56acca
 ;;; gnus-mh.el ends here