(require 'gnus)
(require 'gnus-msg)
-(defun gnus-summary-save-article-folder (arg)
+(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.
If N is a negative number, save the N previous articles.
;; Thanks to yuki@flab.Fujitsu.JUNET and ohm@kaba.junet.
(mh-find-path)
(let ((folder
- (or folder
- (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*")))
+ (cond ((and (eq folder 'default)
+ gnus-newsgroup-last-folder)
+ gnus-newsgroup-last-folder)
+ (folder 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*"))
+ ;; Find the rcvstore program.
+ (exec-path (if mh-lib (cons mh-lib exec-path) exec-path)))
(gnus-eval-in-buffer-window
- gnus-article-buffer
+ 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)
+ (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)
(kill-buffer errbuf))))
(setq gnus-newsgroup-last-folder folder)))
-(defun gnus-mail-reply-using-mhe (&optional yank)
- "Compose reply mail using mh-e.
-Optional argument YANK means yank original article.
-The command \\[mh-yank-cur-msg] yank the original message into current buffer."
- (let (from cc subject date to reply-to to-userid orig-to
- (config (current-window-configuration))
- buffer)
- (pop-to-buffer gnus-article-buffer)
- (setq buffer (current-buffer))
- (save-excursion
- (save-restriction
- (or gnus-user-login-name ; we need this
- (setq gnus-user-login-name (or (getenv "USER")
- (getenv "LOGNAME"))))
-
- (gnus-article-show-all-headers) ;; so colors are happy
- ;; lots of junk to avoid mh-send deleting other windows
- (setq from (gnus-fetch-field "from")
- subject (let ((subject (or (gnus-fetch-field "subject")
- "(None)")))
- (if (and subject
- (not (string-match "^[Rr][Ee]:.+$" subject)))
- (concat "Re: " subject) subject))
- reply-to (gnus-fetch-field "reply-to")
- cc (gnus-fetch-field "cc")
- orig-to (or (gnus-fetch-field "to") "")
- date (gnus-fetch-field "date"))
- (setq to (or reply-to from))
- (setq to-userid (mail-strip-quoted-names orig-to))
- (if (or (string-match "," orig-to)
- (not (string-match (substring to-userid 0
- (string-match "@" to-userid))
- gnus-user-login-name)))
- (setq cc (concat (if cc (concat cc ", ") "") orig-to)))
- ;; mh-yank-cur-msg needs to have mh-show-buffer set in the
- ;; *Article* buffer
- (setq mh-show-buffer buffer)))
-
+(defun gnus-mh-mail-setup (to subject in-reply-to cc replybuffer actions)
+ (let ((config (current-window-configuration)))
(mh-find-path)
- (mh-send-sub to (or cc "")
- (or subject "(None)") config) ;; Erik Selberg 1/23/94
-
- (let ((draft (current-buffer))
- (gnus-mail-buffer (current-buffer))
- mail-buf)
- (if (not yank)
- (gnus-configure-windows 'reply)
- (gnus-configure-windows 'reply-yank))
- (setq mail-buf gnus-mail-buffer)
- (pop-to-buffer mail-buf) ;; always in the display, so won't have window probs
- (switch-to-buffer draft)
- (kill-buffer mail-buf) ;; mh-e don't use it!
- )
-
- ;; (mh-send to (or cc "") subject);; shouldn't use according to mhe
-
- ;; note - current buffer is now draft!
- (save-excursion
- (mh-insert-fields
- "In-reply-to:"
- (concat
- (substring from 0 (string-match " *at \\| *@ \\| *(\\| *<" from))
- "'s message of " date)))
-
- ;; need this for mh-yank-cur-msg
- (setq mh-sent-from-folder buffer)
+ (mh-send-sub (or to "") (or cc "") (or subject "") config)
+ (when in-reply-to
+ (save-excursion
+ (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-show-buffer buffer)
- (setq mh-previous-window-config config)
- )
-
- ;; Then, yank original article if requested.
- (if yank
- (let ((last (point)))
- (mh-yank-cur-msg)
- (goto-char last))))
-
-;; gnus-mail-forward-using-mhe is contributed by Jun-ichiro Itoh
-;; <itojun@ingram.mt.cs.keio.ac.jp>
-
-(defun gnus-mail-forward-using-mhe (&optional buffer)
- "Forward the current message to another user using mh-e."
- ;; First of all, prepare mhe mail buffer.
- (let* ((to (read-string "To: "))
- (cc (read-string "Cc: "))
- (buffer (or buffer gnus-article-buffer))
- (config (current-window-configuration)) ;; need to add this - erik
- (subject (gnus-forward-make-subject buffer)))
- (setq mh-show-buffer buffer)
- (mh-find-path)
- (mh-send-sub to (or cc "") (or subject "(None)") config) ;; Erik Selberg 1/23/94
- (let ((draft (current-buffer))
- (gnus-mail-buffer (current-buffer))
- mail-buf)
- (gnus-configure-windows 'reply-yank)
- (setq mail-buf (eval (cdr (assq 'mail gnus-window-to-buffer))))
- (pop-to-buffer mail-buf) ;; always in the display, so won't have window probs
- (switch-to-buffer draft)
- (kill-buffer mail-buf) ;; mh-e don't use it!
- )
- (save-excursion
- (goto-char (point-max))
- (insert "\n------- Forwarded Message\n\n")
- (insert-buffer buffer)
- (goto-char (point-max))
- (insert "\n------- End of Forwarded Message\n")
- (setq mh-sent-from-folder buffer)
- (setq mh-sent-from-msg 1)
- (setq mh-previous-window-config config)
- )))
-
-(defun gnus-mail-other-window-using-mhe ()
- "Compose mail other window using mh-e."
- (let ((to (read-string "To: "))
- (cc (read-string "Cc: "))
- (subject (read-string "Subject: ")))
- (gnus-article-show-all-headers) ;I don't think this is really needed.
- (setq mh-show-buffer (current-buffer))
- (mh-find-path)
- (mh-send-other-window to cc subject)
- (setq mh-sent-from-folder (current-buffer))
- (setq mh-sent-from-msg 1)))
+ (setq gnus-mail-buffer (buffer-name (current-buffer)))
+ (use-local-map (copy-keymap (current-local-map)))
+ (local-set-key "\C-c\C-c" 'gnus-mh-mail-send-and-exit)
+ (setq mh-show-buffer gnus-article-copy)
+ (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.