X-Git-Url: http://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Fgnus-msg.el;h=ff250b8eb260f6f31493117c32d8841ece57cb1d;hb=5beb390633ce1e32cdf319c6ba19926244bbfdf2;hp=cb5460f3ecfeb0d330cb8a0c336679fc8da881a5;hpb=934635c6adabee85fe22f31c8b67e5f560f41f55;p=gnus

diff --git a/lisp/gnus-msg.el b/lisp/gnus-msg.el
index cb5460f3e..ff250b8eb 100644
--- a/lisp/gnus-msg.el
+++ b/lisp/gnus-msg.el
@@ -163,6 +163,22 @@ if nil, attach files as normal parts."
 		 (const all :tag "Any")
 		 (string :tag "Regexp")))
 
+(defcustom gnus-gcc-self-resent-messages 'no-gcc-self
+  "Like `gcc-self' group parameter, only for unmodified resent messages.
+Applied to messages sent by `gnus-summary-resend-message'.  Non-nil
+value of this variable takes precedence over any existing Gcc header.
+
+If this is `none', no Gcc copy will be made.  If this is t, messages
+resent will be Gcc'd to the current group.  If this is a string, it
+specifies a group to which resent messages will be Gcc'd.  If this is
+nil, Gcc will be done according to existing Gcc header(s), if any.
+If this is `no-gcc-self', resent messages will be Gcc'd to groups that
+existing Gcc header specifies, except for the current group."
+  :version "24.2"
+  :group 'gnus-message
+  :type '(choice (const none) (const t) string (const nil)
+		 (const no-gcc-self)))
+
 (gnus-define-group-parameter
  posting-charset-alist
  :type list
@@ -297,6 +313,22 @@ If nil, the address field will always be empty after invoking
   :group 'gnus-message
   :type 'boolean)
 
+(defcustom gnus-gcc-pre-body-encode-hook nil
+  "A hook called before encoding the body of the Gcc copy of a message.
+The current buffer (when the hook is run) contains the message
+including the message header.  Changes made to the message will
+only affect the Gcc copy, but not the original message."
+  :group 'gnus-message
+  :type 'hook)
+
+(defcustom gnus-gcc-post-body-encode-hook nil
+    "A hook called after encoding the body of the Gcc copy of a message.
+The current buffer (when the hook is run) contains the message
+including the message header.  Changes made to the message will
+only affect the Gcc copy, but not the original message."
+  :group 'gnus-message
+  :type 'hook)
+
 (autoload 'gnus-message-citation-mode "gnus-cite" nil t)
 
 ;;; Internal variables.
@@ -478,22 +510,28 @@ Thank you for your help in stamping out bugs.
 
 ;;;###autoload
 (defun gnus-msg-mail (&optional to subject other-headers continue
-		      switch-action yank-action send-actions return-action)
+				switch-action yank-action send-actions
+				return-action)
   "Start editing a mail message to be sent.
 Like `message-mail', but with Gnus paraphernalia, particularly the
-Gcc: header for archiving purposes."
+Gcc: header for archiving purposes.
+If Gnus isn't running, a plain `message-mail' setup is used
+instead."
   (interactive)
-  (let ((buf (current-buffer))
-	mail-buf)
-    (gnus-setup-message 'message
+  (if (not (gnus-alive-p))
       (message-mail to subject other-headers continue
-		    nil yank-action send-actions return-action))
-    (when switch-action
-      (setq mail-buf (current-buffer))
-      (switch-to-buffer buf)
-      (apply switch-action mail-buf nil)))
-  ;; COMPOSEFUNC should return t if succeed.  Undocumented ???
-  t)
+                    nil yank-action send-actions return-action)
+    (let ((buf (current-buffer))
+	  mail-buf)
+      (gnus-setup-message 'message
+	(message-mail to subject other-headers continue
+		      nil yank-action send-actions return-action))
+      (when switch-action
+	(setq mail-buf (current-buffer))
+	(switch-to-buffer buf)
+	(apply switch-action mail-buf nil))
+      ;; COMPOSEFUNC should return t if succeed.  Undocumented ???
+      t)))
 
 ;;;###autoload
 (defun gnus-button-mailto (address)
@@ -636,7 +674,7 @@ a news."
 	     (if (= 1 (prefix-numeric-value arg))
 		 (gnus-group-completing-read "Newsgroup" nil
 					     (gnus-read-active-file-p))
-	       (gnus-group-group-name))
+	       (or (gnus-group-group-name) ""))
 	   ""))
 	;; make sure last viewed article doesn't affect posting styles:
 	(gnus-article-copy))
@@ -1264,6 +1302,43 @@ For the \"inline\" alternatives, also see the variable
 	    (set-buffer gnus-original-article-buffer)
 	    (message-forward post)))))))
 
+(defun gnus-summary-resend-message-insert-gcc ()
+  "Insert Gcc header according to `gnus-gcc-self-resent-messages'."
+  (gnus-inews-insert-gcc)
+  (let ((gcc (mapcar
+	      (lambda (group)
+		(mm-encode-coding-string
+		 group
+		 (gnus-group-name-charset (gnus-inews-group-method group)
+					  group)))
+	      (message-unquote-tokens
+	       (message-tokenize-header (mail-fetch-field "gcc" nil t)
+					" ,")))))
+    (message-remove-header "gcc")
+    (when gcc
+      (goto-char (point-max))
+      (cond ((eq gnus-gcc-self-resent-messages 'none))
+	    ((eq gnus-gcc-self-resent-messages t)
+	     (insert "Gcc: \"" gnus-newsgroup-name "\"\n"))
+	    ((stringp gnus-gcc-self-resent-messages)
+	     (insert "Gcc: "
+		     (mm-encode-coding-string
+		      (if (string-match " " gnus-gcc-self-resent-messages)
+			  (concat "\"" gnus-gcc-self-resent-messages "\"")
+			gnus-gcc-self-resent-messages)
+		      (gnus-group-name-charset
+		       (gnus-inews-group-method gnus-gcc-self-resent-messages)
+		       gnus-gcc-self-resent-messages))
+		     "\n"))
+	    ((null gnus-gcc-self-resent-messages)
+	     (insert "Gcc: " (mapconcat 'identity gcc ", ") "\n"))
+	    ((eq gnus-gcc-self-resent-messages 'no-gcc-self)
+	     (when (setq gcc (delete
+			      gnus-newsgroup-name
+			      (delete (concat "\"" gnus-newsgroup-name "\"")
+				      gcc)))
+	       (insert "Gcc: " (mapconcat 'identity gcc ", ") "\n")))))))
+
 (defun gnus-summary-resend-message (address n)
   "Resend the current article to ADDRESS."
   (interactive
@@ -1277,12 +1352,21 @@ For the \"inline\" alternatives, also see the variable
 	    (with-current-buffer gnus-original-article-buffer
 	      (nnmail-fetch-field "to"))))
 	 current-prefix-arg))
-  (dolist (article (gnus-summary-work-articles n))
-    (gnus-summary-select-article nil nil nil article)
-    (with-current-buffer gnus-original-article-buffer
-      (let ((gnus-gcc-externalize-attachments nil))
-	(message-resend address)))
-    (gnus-summary-mark-article-as-forwarded article)))
+  (let ((message-header-setup-hook (copy-sequence message-header-setup-hook))
+	(message-sent-hook (copy-sequence message-sent-hook)))
+    ;; `gnus-summary-resend-message-insert-gcc' must run last.
+    (add-hook 'message-header-setup-hook
+	      'gnus-summary-resend-message-insert-gcc t)
+    (add-hook 'message-sent-hook (if gnus-agent
+				     'gnus-agent-possibly-do-gcc
+				   'gnus-inews-do-gcc))
+    (dolist (article (gnus-summary-work-articles n))
+      (gnus-summary-select-article nil nil nil article)
+      (with-current-buffer gnus-original-article-buffer
+	(let ((gnus-gcc-externalize-attachments nil)
+	      (message-inhibit-body-encoding t))
+	  (message-resend address)))
+      (gnus-summary-mark-article-as-forwarded article))))
 
 ;; From: Matthieu Moy <Matthieu.Moy@imag.fr>
 (defun gnus-summary-resend-message-edit ()
@@ -1447,7 +1531,6 @@ If YANK is non-nil, include the original article."
     (error "Gnus has been shut down"))
   (gnus-setup-message (if (message-mail-user-agent) 'message 'bug)
     (unless (message-mail-user-agent)
-      (delete-other-windows)
       (when gnus-bug-create-help-buffer
 	(switch-to-buffer "*Gnus Help Bug*")
 	(erase-buffer)
@@ -1575,7 +1658,9 @@ this is a reply."
 	      (nnheader-set-temp-buffer " *acc*")
 	      (setq message-options (with-current-buffer cur message-options))
 	      (insert-buffer-substring cur)
+	      (run-hooks 'gnus-gcc-pre-body-encode-hook)
 	      (message-encode-message-body)
+	      (run-hooks 'gnus-gcc-post-body-encode-hook)
 	      (save-restriction
 		(message-narrow-to-headers)
 		(let* ((mail-parse-charset message-default-charset)
@@ -1624,12 +1709,16 @@ this is a reply."
 	      (when (and group-art
 			 ;; FIXME: Should gcc-mark-as-read work when
 			 ;; Gnus is not running?
-			 (gnus-alive-p)
-			 (or gnus-gcc-mark-as-read
-			     (and
-			      (boundp 'gnus-inews-mark-gcc-as-read)
-			      (symbol-value 'gnus-inews-mark-gcc-as-read))))
-		(gnus-group-mark-article-read group (cdr group-art)))
+			 (gnus-alive-p))
+		(if (or gnus-gcc-mark-as-read
+			(and (boundp 'gnus-inews-mark-gcc-as-read)
+			     (symbol-value 'gnus-inews-mark-gcc-as-read)))
+		    (gnus-group-mark-article-read group (cdr group-art))
+		  (with-current-buffer gnus-group-buffer
+		    (let ((gnus-group-marked (list group))
+			  (gnus-get-new-news-hook nil)
+			  (inhibit-read-only t))
+		      (gnus-group-get-new-news-this-group nil t)))))
 	      (setq options message-options)
 	      (with-current-buffer cur (setq message-options options))
 	      (kill-buffer (current-buffer)))))))))