*** empty log message ***

[gnus] / lisp / gnus-msg.el

diff --git a/lisp/gnus-msg.el b/lisp/gnus-msg.el
index d732bf4..ad27d85 100644 (file)
--- a/lisp/gnus-msg.el
+++ b/lisp/gnus-msg.el
@@ -1,8 +1,8 @@
 ;;; gnus-msg.el --- mail and post interface for Gnus
 ;;; gnus-msg.el --- mail and post interface for Gnus

-;; Copyright (C) 1995,96 Free Software Foundation, Inc.
+;; Copyright (C) 1995,96,97,98,99 Free Software Foundation, Inc.

 
 ;; Author: Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
 
 ;; 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.
 ;; Keywords: news
 
 ;; This file is part of GNU Emacs.


@@ -26,30 +26,38 @@
 
 ;;; Code:
 
 
 ;;; Code:
 

-(require 'gnus-load)
+(eval-when-compile (require 'cl))
+
+(require 'gnus)

 (require 'gnus-ems)
 (require 'message)
 (require 'gnus-art)
 (require 'gnus-ems)
 (require 'message)
 (require 'gnus-art)

-(require 'gnus)

 
 

-;; Added by Sudish Joseph <joseph@cis.ohio-state.edu>.
-(defvar gnus-post-method nil
+(defcustom gnus-post-method nil

   "*Preferred method for posting USENET news.
   "*Preferred method for posting USENET news.

-If this variable is nil, Gnus will use the current method to decide
-which method to use when posting.  If it is non-nil, it will override
-the current method.  This method will not be used in mail groups and
-the like, only in \"real\" newsgroups.

 
 

-The value must be a valid method as discussed in the documentation of
-`gnus-select-method'.  It can also be a list of methods.  If that is
-the case, the user will be queried for what select method to use when
-posting.")
+If this variable is `current', Gnus will use the \"current\" select
+method when posting.  If it is nil (which is the default), Gnus will
+use the native posting method of the server.
+
+This method will not be used in mail groups and the like, only in
+\"real\" newsgroups.
+
+If not nil nor `native', the value must be a valid method as discussed
+in the documentation of `gnus-select-method'. It can also be a list of
+methods. If that is the case, the user will be queried for what select
+method to use when posting."
+  :group 'gnus-group-foreign
+  :type `(choice (const nil)
+                 (const current)
+                (const native)
+                (sexp :tag "Methods" ,gnus-select-method)))

 
 (defvar gnus-outgoing-message-group nil
   "*All outgoing messages will be put in this group.
 If you want to store all your outgoing mail and articles in the group
 
 (defvar gnus-outgoing-message-group nil
   "*All outgoing messages will be put in this group.
 If you want to store all your outgoing mail and articles in the group

-\"nnml:archive\", you set this variable to that value. This variable
-can also be a list of group names. 
+\"nnml:archive\", you set this variable to that value.  This variable
+can also be a list of group names.

 
 If you want to have greater control over what group to put each
 message in, you can set this variable to a function that checks the
 
 If you want to have greater control over what group to put each
 message in, you can set this variable to a function that checks the


@@ -62,12 +70,8 @@ This is useful when you're reading a mailing list that has been
 gatewayed to a newsgroup, and you want to followup to an article in
 the group.")
 
 gatewayed to a newsgroup, and you want to followup to an article in
 the group.")
 

-(defvar gnus-sent-message-ids-file 
-  (nnheader-concat gnus-directory "Sent-Message-IDs")
-  "File where Gnus saves a cache of sent message ids.")
-
-(defvar gnus-sent-message-ids-length 1000
-  "The number of sent Message-IDs to save.")
+(defvar gnus-add-to-list nil
+  "*If non-nil, add a `to-list' parameter automatically.")

 
 (defvar gnus-crosspost-complaint
   "Hi,
 
 (defvar gnus-crosspost-complaint
   "Hi,


@@ -81,16 +85,40 @@ of this message.  Please trim your Newsgroups header to exclude this
 group before posting in the future.
 
 Thank you.
 group before posting in the future.
 
 Thank you.

+

 "
   "Format string to be inserted when complaining about crossposts.
 The first %s will be replaced by the Newsgroups header;
 the second with the current group name.")
 
 "
   "Format string to be inserted when complaining about crossposts.
 The first %s will be replaced by the Newsgroups header;
 the second with the current group name.")
 

+(defvar gnus-message-setup-hook nil
+  "Hook run after setting up a message buffer.")
+
+(defvar gnus-bug-create-help-buffer t
+  "*Should we create the *Gnus Help Bug* buffer?")
+
+(defvar gnus-posting-styles nil
+  "*Alist of styles to use when posting.")
+
+(defcustom gnus-group-posting-charset-alist
+  '(("^no\\." iso-8859-1)
+    (message-this-is-mail nil)
+    (".*" iso-8859-1)
+    (message-this-is-news iso-8859-1))
+  "Alist of regexps (to match group names) and default charsets to be unencoded when posting."
+  :type '(repeat (list (regexp :tag "Group")
+                      (symbol :tag "Charset")))
+  :group 'gnus-charset)
+

 ;;; Internal variables.
 
 ;;; Internal variables.
 

+(defvar gnus-inhibit-posting-styles nil
+  "Inhibit the use of posting styles.")
+

 (defvar gnus-message-buffer "*Mail Gnus*")
 (defvar gnus-article-copy nil)
 (defvar gnus-last-posting-server nil)
 (defvar gnus-message-buffer "*Mail Gnus*")
 (defvar gnus-article-copy nil)
 (defvar gnus-last-posting-server nil)

+(defvar gnus-message-group-art nil)

 
 (defconst gnus-bug-message
   "Sending a bug report to the Gnus Towers.
 
 (defconst gnus-bug-message
   "Sending a bug report to the Gnus Towers.


@@ -99,9 +127,10 @@ the second with the current group name.")
 The buffer below is a mail buffer.  When you press `C-c C-c', it will
 be sent to the Gnus Bug Exterminators.
 
 The buffer below is a mail buffer.  When you press `C-c C-c', it will
 be sent to the Gnus Bug Exterminators.
 

-At the bottom of the buffer you'll see lots of variable settings.
-Please do not delete those.  They will tell the Bug People what your
-environment is, so that it will be easier to locate the bugs.
+The thing near the bottom of the buffer is how the environment
+settings will be included in the mail.  Please do not delete that.
+They will tell the Bug People what your environment is, so that it
+will be easier to locate the bugs.

 
 If you have found a bug that makes Emacs go \"beep\", set
 debug-on-error to t (`M-x set-variable RET debug-on-error RET t RET')
 
 If you have found a bug that makes Emacs go \"beep\", set
 debug-on-error to t (`M-x set-variable RET debug-on-error RET t RET')


@@ -132,6 +161,10 @@ Thank you for your help in stamping out bugs.
   "s" gnus-summary-supersede-article
   "r" gnus-summary-reply
   "R" gnus-summary-reply-with-original
   "s" gnus-summary-supersede-article
   "r" gnus-summary-reply
   "R" gnus-summary-reply-with-original

+  "w" gnus-summary-wide-reply
+  "W" gnus-summary-wide-reply-with-original
+  "n" gnus-summary-followup-to-mail
+  "N" gnus-summary-followup-to-mail-with-original

   "m" gnus-summary-mail-other-window
   "u" gnus-uu-post-news
   "\M-c" gnus-summary-mail-crosspost-complaint
   "m" gnus-summary-mail-other-window
   "u" gnus-uu-post-news
   "\M-c" gnus-summary-mail-crosspost-complaint


@@ -149,25 +182,53 @@ Thank you for your help in stamping out bugs.
 
 (defvar gnus-article-reply nil)
 (defmacro gnus-setup-message (config &rest forms)
 
 (defvar gnus-article-reply nil)
 (defmacro gnus-setup-message (config &rest forms)

-  (let ((winconf (make-symbol "winconf"))
-       (buffer (make-symbol "buffer"))
-       (article (make-symbol "article")))
+  (let ((winconf (make-symbol "gnus-setup-message-winconf"))
+       (buffer (make-symbol "gnus-setup-message-buffer"))
+       (article (make-symbol "gnus-setup-message-article"))
+       (group (make-symbol "gnus-setup-message-group")))

     `(let ((,winconf (current-window-configuration))
     `(let ((,winconf (current-window-configuration))

-          (,buffer (current-buffer))
+          (,buffer (buffer-name (current-buffer)))

           (,article (and gnus-article-reply (gnus-summary-article-number)))
           (,article (and gnus-article-reply (gnus-summary-article-number)))

+          (,group gnus-newsgroup-name)

           (message-header-setup-hook
           (message-header-setup-hook

-           (copy-sequence message-header-setup-hook)))
+           (copy-sequence message-header-setup-hook))
+          (message-mode-hook (copy-sequence message-mode-hook)))

        (add-hook 'message-header-setup-hook 'gnus-inews-insert-gcc)
        (add-hook 'message-header-setup-hook 'gnus-inews-insert-archive-gcc)
        (add-hook 'message-header-setup-hook 'gnus-inews-insert-gcc)
        (add-hook 'message-header-setup-hook 'gnus-inews-insert-archive-gcc)

-       ,@forms
-       (gnus-inews-add-send-actions ,winconf ,buffer ,article)
-       (setq gnus-message-buffer (current-buffer))
-       (make-local-variable 'gnus-newsgroup-name)
-       (gnus-configure-windows ,config t))))
-    
+       (add-hook 'message-mode-hook 'gnus-configure-posting-styles)
+       (unwind-protect
+          (progn
+            ,@forms)
+        (gnus-inews-add-send-actions ,winconf ,buffer ,article)
+        (setq gnus-message-buffer (current-buffer))
+        (set (make-local-variable 'gnus-message-group-art)
+             (cons ,group ,article))
+        (set (make-local-variable 'gnus-newsgroup-name) ,group)
+        (set (make-local-variable 'message-posting-charset)
+             (gnus-setup-posting-charset ,group))
+        (gnus-run-hooks 'gnus-message-setup-hook))
+       (gnus-add-buffer)
+       (gnus-configure-windows ,config t)
+       (set-buffer-modified-p nil))))
+
+(defun gnus-setup-posting-charset (group)
+  (let ((alist gnus-group-posting-charset-alist)
+       (group (or group ""))
+       elem)
+    (when group
+      (catch 'found
+       (while (setq elem (pop alist))
+         (when (or (and (stringp (car elem))
+                        (string-match (car elem) group))
+                   (and (gnus-functionp (car elem))
+                        (funcall (car elem) group))
+                   (and (symbolp (car elem))
+                        (symbol-value (car elem))))
+           (throw 'found (cadr elem))))))))
+

 (defun gnus-inews-add-send-actions (winconf buffer article)
 (defun gnus-inews-add-send-actions (winconf buffer article)

-  (gnus-make-local-hook 'message-sent-hook)
-  (gnus-add-hook 'message-sent-hook 'gnus-inews-do-gcc nil t)
+  (make-local-hook 'message-sent-hook)
+  (add-hook 'message-sent-hook 'gnus-inews-do-gcc nil t)

   (setq message-post-method
        `(lambda (arg)
           (gnus-post-method arg ,gnus-newsgroup-name)))
   (setq message-post-method
        `(lambda (arg)
           (gnus-post-method arg ,gnus-newsgroup-name)))


@@ -175,7 +236,7 @@ Thank you for your help in stamping out bugs.
   (message-add-action
    `(set-window-configuration ,winconf) 'exit 'postpone 'kill)
   (message-add-action
   (message-add-action
    `(set-window-configuration ,winconf) 'exit 'postpone 'kill)
   (message-add-action

-   `(when (buffer-name ,buffer)
+   `(when (gnus-buffer-exists-p ,buffer)

       (save-excursion
        (set-buffer ,buffer)
        ,(when article
       (save-excursion
        (set-buffer ,buffer)
        ,(when article


@@ -183,24 +244,40 @@ Thank you for your help in stamping out bugs.
    'send))
 
 (put 'gnus-setup-message 'lisp-indent-function 1)
    'send))
 
 (put 'gnus-setup-message 'lisp-indent-function 1)

-(put 'gnus-setup-message 'lisp-indent-hook 1)

 (put 'gnus-setup-message 'edebug-form-spec '(form body))
 
 ;;; Post news commands of Gnus group mode and summary mode
 
 (put 'gnus-setup-message 'edebug-form-spec '(form body))
 
 ;;; Post news commands of Gnus group mode and summary mode
 

-(defun gnus-group-mail ()
-  "Start composing a mail."
-  (interactive)
-  (gnus-setup-message 'message
-    (message-mail)))
+(defun gnus-group-mail (&optional arg)
+  "Start composing a mail.
+If ARG, use the group under the point to find a posting style.
+If ARG is 1, prompt for a group name to find the posting style."
+  (interactive "P")
+  ;; We can't `let' gnus-newsgroup-name here, since that leads
+  ;; to local variables leaking.
+  (let ((group gnus-newsgroup-name)
+       (buffer (current-buffer)))
+    (unwind-protect
+       (progn
+         (setq gnus-newsgroup-name
+               (if arg
+                   (if (= 1 (prefix-numeric-value arg))
+                       (completing-read "Use posting style of group: "
+                                        gnus-active-hashtb nil
+                                        (gnus-read-active-file-p))
+                     (gnus-group-group-name))
+                 ""))
+         (gnus-setup-message 'message (message-mail)))
+      (save-excursion
+       (set-buffer buffer)
+       (setq gnus-newsgroup-name group)))))

 
 (defun gnus-group-post-news (&optional arg)
   "Start composing a news message.
 If ARG, post to the group under point.
 If ARG is 1, prompt for a group name."
   (interactive "P")
 
 (defun gnus-group-post-news (&optional arg)
   "Start composing a news message.
 If ARG, post to the group under point.
 If ARG is 1, prompt for a group name."
   (interactive "P")

-  ;; Bind this variable here to make message mode hooks
-  ;; work ok.
+  ;; Bind this variable here to make message mode hooks work ok.

   (let ((gnus-newsgroup-name
         (if arg
             (if (= 1 (prefix-numeric-value arg))
   (let ((gnus-newsgroup-name
         (if arg
             (if (= 1 (prefix-numeric-value arg))


@@ -213,16 +290,14 @@ If ARG is 1, prompt for a group name."
 (defun gnus-summary-post-news ()
   "Start composing a news message."
   (interactive)
 (defun gnus-summary-post-news ()
   "Start composing a news message."
   (interactive)

-  (gnus-set-global-variables)

   (gnus-post-news 'post gnus-newsgroup-name))
 
 (defun gnus-summary-followup (yank &optional force-news)
   "Compose a followup to an article.
 If prefix argument YANK is non-nil, original article is yanked automatically."
   (gnus-post-news 'post gnus-newsgroup-name))
 
 (defun gnus-summary-followup (yank &optional force-news)
   "Compose a followup to an article.
 If prefix argument YANK is non-nil, original article is yanked automatically."

-  (interactive 
-   (list (and current-prefix-arg 
+  (interactive
+   (list (and current-prefix-arg

              (gnus-summary-work-articles 1))))
              (gnus-summary-work-articles 1))))

-  (gnus-set-global-variables)

   (when yank
     (gnus-summary-goto-subject (car yank)))
   (save-window-excursion
   (when yank
     (gnus-summary-goto-subject (car yank)))
   (save-window-excursion


@@ -231,7 +306,7 @@ If prefix argument YANK is non-nil, original article is yanked automatically."
        (gnus-newsgroup-name gnus-newsgroup-name))
     ;; Send a followup.
     (gnus-post-news nil gnus-newsgroup-name
        (gnus-newsgroup-name gnus-newsgroup-name))
     ;; Send a followup.
     (gnus-post-news nil gnus-newsgroup-name

-                   headers gnus-article-buffer 
+                   headers gnus-article-buffer

                    yank nil force-news)))
 
 (defun gnus-summary-followup-with-original (n &optional force-news)
                    yank nil force-news)))
 
 (defun gnus-summary-followup-with-original (n &optional force-news)


@@ -239,8 +314,21 @@ If prefix argument YANK is non-nil, original article is yanked automatically."
   (interactive "P")
   (gnus-summary-followup (gnus-summary-work-articles n) force-news))
 
   (interactive "P")
   (gnus-summary-followup (gnus-summary-work-articles n) force-news))
 

+(defun gnus-summary-followup-to-mail (&optional arg)
+  "Followup to the current mail message via news."
+  (interactive
+   (list (and current-prefix-arg
+             (gnus-summary-work-articles 1))))
+  (gnus-summary-followup arg t))
+
+(defun gnus-summary-followup-to-mail-with-original (&optional arg)
+  "Followup to the current mail message via news."
+  (interactive "P")
+  (gnus-summary-followup (gnus-summary-work-articles arg) t))
+

 (defun gnus-inews-yank-articles (articles)
   (let (beg article)
 (defun gnus-inews-yank-articles (articles)
   (let (beg article)

+    (message-goto-body)

     (while (setq article (pop articles))
       (save-window-excursion
        (set-buffer gnus-summary-buffer)
     (while (setq article (pop articles))
       (save-window-excursion
        (set-buffer gnus-summary-buffer)


@@ -251,19 +339,21 @@ If prefix argument YANK is non-nil, original article is yanked automatically."
            (message-reply-headers gnus-current-headers))
        (message-yank-original)
        (setq beg (or beg (mark t))))
            (message-reply-headers gnus-current-headers))
        (message-yank-original)
        (setq beg (or beg (mark t))))

-      (when articles (insert "\n")))
-    
+      (when articles
+       (insert "\n")))

     (push-mark)
     (goto-char beg)))
 
     (push-mark)
     (goto-char beg)))
 

-(defun gnus-summary-cancel-article (n)
-  "Cancel an article you posted."
-  (interactive "P")
-  (gnus-set-global-variables)
+(defun gnus-summary-cancel-article (&optional n symp)
+  "Cancel an article you posted.
+Uses the process-prefix convention.  If given the symbolic
+prefix `a', cancel using the standard posting method; if not
+post using the current select method."
+  (interactive (gnus-interactive "P\ny"))

   (let ((articles (gnus-summary-work-articles n))
        (message-post-method
         `(lambda (arg)
   (let ((articles (gnus-summary-work-articles n))
        (message-post-method
         `(lambda (arg)

-           (gnus-post-method nil ,gnus-newsgroup-name)))
+           (gnus-post-method (not (eq symp 'a)) ,gnus-newsgroup-name)))

        article)
     (while (setq article (pop articles))
       (when (gnus-summary-select-article t nil nil article)
        article)
     (while (setq article (pop articles))
       (when (gnus-summary-select-article t nil nil article)


@@ -279,7 +369,6 @@ If prefix argument YANK is non-nil, original article is yanked automatically."
 This is done simply by taking the old article and adding a Supersedes
 header line with the old Message-ID."
   (interactive)
 This is done simply by taking the old article and adding a Supersedes
 header line with the old Message-ID."
   (interactive)

-  (gnus-set-global-variables)

   (let ((article (gnus-summary-article-number)))
     (gnus-setup-message 'reply-yank
       (gnus-summary-select-article t)
   (let ((article (gnus-summary-article-number)))
     (gnus-setup-message 'reply-yank
       (gnus-summary-select-article t)


@@ -287,7 +376,11 @@ header line with the old Message-ID."
       (message-supersede)
       (push
        `((lambda ()
       (message-supersede)
       (push
        `((lambda ()

-          (gnus-cache-possibly-remove-article ,article nil nil nil t)))
+          (when (gnus-buffer-exists-p ,gnus-summary-buffer)
+            (save-excursion
+              (set-buffer ,gnus-summary-buffer)
+              (gnus-cache-possibly-remove-article ,article nil nil nil t)
+              (gnus-summary-mark-as-read ,article gnus-canceled-mark)))))

        message-send-actions))))
 
 \f
        message-send-actions))))
 
 \f


@@ -297,14 +390,15 @@ header line with the old Message-ID."
   ;; this copy is in the buffer gnus-article-copy.
   ;; if ARTICLE-BUFFER is nil, gnus-article-buffer is used
   ;; this buffer should be passed to all mail/news reply/post routines.
   ;; this copy is in the buffer gnus-article-copy.
   ;; if ARTICLE-BUFFER is nil, gnus-article-buffer is used
   ;; this buffer should be passed to all mail/news reply/post routines.

-  (setq gnus-article-copy (get-buffer-create " *gnus article copy*"))
-  (buffer-disable-undo gnus-article-copy)
-  (or (memq gnus-article-copy gnus-buffer-list)
-      (setq gnus-buffer-list (cons gnus-article-copy gnus-buffer-list)))
+  (setq gnus-article-copy (gnus-get-buffer-create " *gnus article copy*"))
+  (save-excursion
+    (set-buffer gnus-article-copy)
+    (mm-enable-multibyte))

   (let ((article-buffer (or article-buffer gnus-article-buffer))
   (let ((article-buffer (or article-buffer gnus-article-buffer))

-       end beg contents)
-    (when (and (get-buffer article-buffer)
-              (buffer-name (get-buffer article-buffer)))
+       end beg)
+    (if (not (and (get-buffer article-buffer)
+                 (gnus-buffer-exists-p article-buffer)))
+       (error "Can't find any article buffer")

       (save-excursion
        (set-buffer article-buffer)
        (save-restriction
       (save-excursion
        (set-buffer article-buffer)
        (save-restriction


@@ -313,7 +407,9 @@ header line with the old Message-ID."
          (widen)
          (copy-to-buffer gnus-article-copy (point-min) (point-max))
          (set-buffer gnus-article-copy)
          (widen)
          (copy-to-buffer gnus-article-copy (point-min) (point-max))
          (set-buffer gnus-article-copy)

-         (article-delete-text-of-type 'annotation)
+         (gnus-article-delete-text-of-type 'annotation)
+         (gnus-remove-text-with-property 'gnus-prev)
+         (gnus-remove-text-with-property 'gnus-next)

          (insert
           (prog1
               (format "%s" (buffer-string))
          (insert
           (prog1
               (format "%s" (buffer-string))


@@ -328,33 +424,38 @@ header line with the old Message-ID."
          ;; Delete the headers from the displayed articles.
          (set-buffer gnus-article-copy)
          (delete-region (goto-char (point-min))
          ;; Delete the headers from the displayed articles.
          (set-buffer gnus-article-copy)
          (delete-region (goto-char (point-min))

-                        (or (search-forward "\n\n" nil t) (point)))
+                        (or (search-forward "\n\n" nil t) (point-max)))

          ;; Insert the original article headers.
          ;; Insert the original article headers.

-         (insert-buffer-substring gnus-original-article-buffer beg end)))
+         (insert-buffer-substring gnus-original-article-buffer beg end)
+         (article-decode-encoded-words)))

       gnus-article-copy)))
 
 (defun gnus-post-news (post &optional group header article-buffer yank subject
                            force-news)
   (when article-buffer
     (gnus-copy-article-buffer))
       gnus-article-copy)))
 
 (defun gnus-post-news (post &optional group header article-buffer yank subject
                            force-news)
   (when article-buffer
     (gnus-copy-article-buffer))

-  (let ((gnus-article-reply article-buffer))
+  (let ((gnus-article-reply article-buffer)
+       (add-to-list gnus-add-to-list))

     (gnus-setup-message (cond (yank 'reply-yank)
                              (article-buffer 'reply)
                              (t 'message))
       (let* ((group (or group gnus-newsgroup-name))
             (pgroup group)
     (gnus-setup-message (cond (yank 'reply-yank)
                              (article-buffer 'reply)
                              (t 'message))
       (let* ((group (or group gnus-newsgroup-name))
             (pgroup group)

-            to-address to-group mailing-list to-list)
+            to-address to-group mailing-list to-list
+            newsgroup-p)

        (when group
          (setq to-address (gnus-group-find-parameter group 'to-address)
                to-group (gnus-group-find-parameter group 'to-group)
                to-list (gnus-group-find-parameter group 'to-list)
        (when group
          (setq to-address (gnus-group-find-parameter group 'to-address)
                to-group (gnus-group-find-parameter group 'to-group)
                to-list (gnus-group-find-parameter group 'to-list)

+               newsgroup-p (gnus-group-find-parameter group 'newsgroup)

                mailing-list (when gnus-mailing-list-groups
                               (string-match gnus-mailing-list-groups group))
                group (gnus-group-real-name group)))
        (if (or (and to-group
                     (gnus-news-group-p to-group))
                mailing-list (when gnus-mailing-list-groups
                               (string-match gnus-mailing-list-groups group))
                group (gnus-group-real-name group)))
        (if (or (and to-group
                     (gnus-news-group-p to-group))

+               newsgroup-p

                force-news
                force-news

-               (and (gnus-news-group-p 
+               (and (gnus-news-group-p

                      (or pgroup gnus-newsgroup-name)
                      (if header (mail-header-number header)
                        gnus-current-article))
                      (or pgroup gnus-newsgroup-name)
                      (if header (mail-header-number header)
                        gnus-current-article))


@@ -365,56 +466,77 @@ header line with the old Message-ID."
            (if post
                (message-news (or to-group group))
              (set-buffer gnus-article-copy)
            (if post
                (message-news (or to-group group))
              (set-buffer gnus-article-copy)

-             (message-followup to-group))
+             (gnus-msg-treat-broken-reply-to)
+             (message-followup (if (or newsgroup-p force-news) nil to-group)))

          ;; The is mail.
          (if post
              (progn
                (message-mail (or to-address to-list))
                ;; Arrange for mail groups that have no `to-address' to
                ;; get that when the user sends off the mail.
          ;; The is mail.
          (if post
              (progn
                (message-mail (or to-address to-list))
                ;; Arrange for mail groups that have no `to-address' to
                ;; get that when the user sends off the mail.

-               (push (list 'gnus-inews-add-to-address group)
-                     message-send-actions))
+               (when (and (not to-list)
+                          (not to-address)
+                          add-to-list)
+                 (push (list 'gnus-inews-add-to-address pgroup)
+                       message-send-actions)))

            (set-buffer gnus-article-copy)
            (set-buffer gnus-article-copy)

+           (gnus-msg-treat-broken-reply-to)

            (message-wide-reply to-address)))
        (when yank
          (gnus-inews-yank-articles yank))))))
 
            (message-wide-reply to-address)))
        (when yank
          (gnus-inews-yank-articles yank))))))
 

+(defun gnus-msg-treat-broken-reply-to ()
+  "Remove the Reply-to header iff broken-reply-to."
+  (when (gnus-group-find-parameter
+        gnus-newsgroup-name 'broken-reply-to)
+    (save-restriction
+      (message-narrow-to-head)
+      (message-remove-header "reply-to"))))
+

 (defun gnus-post-method (arg group &optional silent)
   "Return the posting method based on GROUP and ARG.
 If SILENT, don't prompt the user."
   (let ((group-method (gnus-find-method-for-group group)))
 (defun gnus-post-method (arg group &optional silent)
   "Return the posting method based on GROUP and ARG.
 If SILENT, don't prompt the user."
   (let ((group-method (gnus-find-method-for-group group)))

-    (cond 
-     ;; If the group-method is nil (which shouldn't happen) we use 
+    (cond
+     ;; If the group-method is nil (which shouldn't happen) we use

      ;; the default method.
      ((null group-method)
      ;; the default method.
      ((null group-method)

-      (or gnus-post-method gnus-select-method message-post-method))
-     ;; We want this group's method.
+      (or (and (null (eq gnus-post-method 'active)) gnus-post-method)
+              gnus-select-method message-post-method))
+     ;; We want the inverse of the default

      ((and arg (not (eq arg 0)))
      ((and arg (not (eq arg 0)))

-      group-method)
+      (if (eq gnus-post-method 'active)
+         gnus-select-method
+       group-method))

      ;; We query the user for a post method.
      ((or arg
          (and gnus-post-method
      ;; We query the user for a post method.
      ((or arg
          (and gnus-post-method

+              (not (eq gnus-post-method 'current))

               (listp (car gnus-post-method))))
       (let* ((methods
              ;; Collect all methods we know about.
              (append
               (listp (car gnus-post-method))))
       (let* ((methods
              ;; Collect all methods we know about.
              (append

-              (when gnus-post-method
+              (when (and gnus-post-method
+                         (not (eq gnus-post-method 'current)))

                 (if (listp (car gnus-post-method))
                     gnus-post-method
                   (list gnus-post-method)))
               gnus-secondary-select-methods
                 (if (listp (car gnus-post-method))
                     gnus-post-method
                   (list gnus-post-method)))
               gnus-secondary-select-methods

+              (mapcar 'cdr gnus-server-alist)
+              (mapcar 'car gnus-opened-servers)

               (list gnus-select-method)
               (list group-method)))
             method-alist post-methods method)
        ;; Weed out all mail methods.
        (while methods
          (setq method (gnus-server-get-method "" (pop methods)))
               (list gnus-select-method)
               (list group-method)))
             method-alist post-methods method)
        ;; Weed out all mail methods.
        (while methods
          (setq method (gnus-server-get-method "" (pop methods)))

-         (when (or (gnus-method-option-p method 'post)
-                   (gnus-method-option-p method 'post-mail))
+         (when (and (or (gnus-method-option-p method 'post)
+                        (gnus-method-option-p method 'post-mail))
+                    (not (member method post-methods)))

            (push method post-methods)))
        ;; Create a name-method alist.
        (setq method-alist
            (push method post-methods)))
        ;; Create a name-method alist.
        (setq method-alist

-             (mapcar 
+             (mapcar

               (lambda (m)
                 (list (concat (cadr m) " (" (symbol-name (car m)) ")") m))
               post-methods))
               (lambda (m)
                 (list (concat (cadr m) " (" (symbol-name (car m)) ")") m))
               post-methods))


@@ -431,182 +553,142 @@ If SILENT, don't prompt the user."
                   (cons (or gnus-last-posting-server "") 0))))
          method-alist))))
      ;; Override normal method.
                   (cons (or gnus-last-posting-server "") 0))))
          method-alist))))
      ;; Override normal method.

+     ((and (eq gnus-post-method 'current)
+          (not (eq (car group-method) 'nndraft))
+          (not arg))
+      group-method)

      ((and gnus-post-method
      ((and gnus-post-method

-          (or (gnus-method-option-p group-method 'post)
-              (gnus-method-option-p group-method 'post-mail)
-              (gnus-group-find-parameter group 'to-group)))
+          (not (eq gnus-post-method 'current)))

       gnus-post-method)
       gnus-post-method)

-     ;; Perhaps this is a mail group?
-     ((and (not (gnus-member-of-valid 'post group))
-          (not (gnus-method-option-p group-method 'post-mail))
-          (not (gnus-group-find-parameter group 'to-group)))
-      group-method)

      ;; Use the normal select method.
      (t gnus-select-method))))
 
      ;; Use the normal select method.
      (t gnus-select-method))))
 

-(defun gnus-inews-narrow-to-headers ()
-  (widen)
-  (narrow-to-region
-   (goto-char (point-min))
-   (or (and (re-search-forward 
-            (concat "^" (regexp-quote mail-header-separator) "$") nil t)
-           (match-beginning 0))
-       (point-max)))
-  (goto-char (point-min)))
-
-;;;
-;;; Check whether the message has been sent already.
-;;;
-
-(defvar gnus-inews-sent-ids nil)
-
-(defun gnus-inews-reject-message ()
-  "Check whether this message has already been sent."
-  (when gnus-sent-message-ids-file
-    (let ((message-id (save-restriction (gnus-inews-narrow-to-headers)
-                                       (mail-fetch-field "message-id")))
-         end)
-      (when message-id
-       (unless gnus-inews-sent-ids
-         (condition-case ()
-             (load  t t t)
-           (error nil)))
-       (if (member message-id gnus-inews-sent-ids)
-           ;; Reject this message.
-           (not (gnus-yes-or-no-p 
-                 (format "Message %s already sent.  Send anyway? "
-                         message-id)))
-         (push message-id gnus-inews-sent-ids)
-         ;; Chop off the last Message-IDs.
-         (when (setq end (nthcdr gnus-sent-message-ids-length 
-                                 gnus-inews-sent-ids))
-           (setcdr end nil))
-         (nnheader-temp-write gnus-sent-message-ids-file
-           (gnus-prin1 `(setq gnus-inews-sent-ids ',gnus-inews-sent-ids)))
-         nil)))))
-

 \f
 
 \f
 

-;; Dummy to avoid byte-compile warning.
+;; Dummies to avoid byte-compile warning.

 (defvar nnspool-rejected-article-hook)
 (defvar nnspool-rejected-article-hook)

+(defvar xemacs-codename)

 
 

-;;; Since the X-Newsreader/X-Mailer are ``vanity'' headers, they might
-;;; as well include the Emacs version as well.
-;;; The following function works with later GNU Emacs, and XEmacs.

 (defun gnus-extended-version ()
 (defun gnus-extended-version ()

-  "Stringified Gnus version and Emacs version"
+  "Stringified Gnus version and Emacs version."

   (interactive)
   (concat
   (interactive)
   (concat

-   gnus-version
-   "/"
+   "Gnus/" (prin1-to-string (gnus-continuum-version gnus-version) t)
+   " (" gnus-version ")"
+   " "

    (cond
    (cond

-    ((string-match "^\\([0-9]+\\.[0-9]+\\)\\.[.0-9]+$" emacs-version)
-     (concat "Emacs " (substring emacs-version
-                                (match-beginning 1)
-                                (match-end 1))))
-    ((string-match "\\([A-Z]*[Mm][Aa][Cc][Ss]\\)" emacs-version)
-     (concat (substring emacs-version
-                       (match-beginning 1)
-                       (match-end 1))
-            (format " %d.%d" emacs-major-version emacs-minor-version)))
+    ((string-match "^\\(\\([.0-9]+\\)*\\)\\.[0-9]+$" emacs-version)
+     (concat "Emacs/" (match-string 1 emacs-version)))
+    ((string-match "\\([A-Z]*[Mm][Aa][Cc][Ss]\\)[^(]*\\(\\((beta.*)\\|'\\)\\)?"
+                  emacs-version)
+     (concat (match-string 1 emacs-version)
+            (format "/%d.%d" emacs-major-version emacs-minor-version)
+            (if (match-beginning 3)
+                (match-string 3 emacs-version)
+              "")
+            (if (boundp 'xemacs-codename)
+                (concat " (" xemacs-codename ")")
+              "")))

     (t emacs-version))))
 
     (t emacs-version))))
 

-;; Written by "Mr. Per Persson" <pp@gnu.ai.mit.edu>.
-(defun gnus-inews-insert-mime-headers ()
-  (goto-char (point-min))
-  (let ((mail-header-separator 
-        (progn 
-          (goto-char (point-min))
-          (if (and (search-forward (concat "\n" mail-header-separator "\n")
-                                   nil t)
-                   (not (search-backward "\n\n" nil t)))
-              mail-header-separator
-            ""))))
-    (or (mail-position-on-field "Mime-Version")
-       (insert "1.0")
-       (cond ((save-restriction
-                (widen)
-                (goto-char (point-min))
-                (re-search-forward "[\200-\377]" nil t))
-              (or (mail-position-on-field "Content-Type")
-                  (insert "text/plain; charset=ISO-8859-1"))
-              (or (mail-position-on-field "Content-Transfer-Encoding")
-                  (insert "8bit")))
-             (t (or (mail-position-on-field "Content-Type")
-                    (insert "text/plain; charset=US-ASCII"))
-                (or (mail-position-on-field "Content-Transfer-Encoding")
-                    (insert "7bit")))))))
-

 \f
 ;;;
 \f
 ;;;

-;;; Gnus Mail Functions 
+;;; Gnus Mail Functions

 ;;;
 
 ;;; Mail reply commands of Gnus summary mode
 
 ;;;
 
 ;;; Mail reply commands of Gnus summary mode
 

-(defun gnus-summary-reply (&optional yank)
-  "Reply mail to news author.
-If prefix argument YANK is non-nil, original article is yanked automatically."
-  (interactive 
-   (list (and current-prefix-arg 
+(defun gnus-summary-reply (&optional yank wide)
+  "Start composing a reply mail to the current message.
+If prefix argument YANK is non-nil, the original article is yanked
+automatically."
+  (interactive
+   (list (and current-prefix-arg

              (gnus-summary-work-articles 1))))
              (gnus-summary-work-articles 1))))

-  ;; Bug fix by jbw@bigbird.bu.edu (Joe Wells)

   ;; Stripping headers should be specified with mail-yank-ignored-headers.
   ;; Stripping headers should be specified with mail-yank-ignored-headers.

-  (gnus-set-global-variables)
-  (when yank 
+  (when yank

     (gnus-summary-goto-subject (car yank)))
   (let ((gnus-article-reply t))
     (gnus-setup-message (if yank 'reply-yank 'reply)
       (gnus-summary-select-article)
       (set-buffer (gnus-copy-article-buffer))
     (gnus-summary-goto-subject (car yank)))
   (let ((gnus-article-reply t))
     (gnus-setup-message (if yank 'reply-yank 'reply)
       (gnus-summary-select-article)
       (set-buffer (gnus-copy-article-buffer))

-      (message-reply nil nil (gnus-group-find-parameter
-                             gnus-newsgroup-name 'broken-reply-to))
+      (gnus-msg-treat-broken-reply-to)
+      (message-reply nil wide)

       (when yank
        (gnus-inews-yank-articles yank)))))
 
       (when yank
        (gnus-inews-yank-articles yank)))))
 

-(defun gnus-summary-reply-with-original (n)
-  "Reply mail to news author with original article."
+(defun gnus-summary-reply-with-original (n &optional wide)
+  "Start composing a reply mail to the current message.
+The original article will be yanked."

   (interactive "P")
   (interactive "P")

-  (gnus-summary-reply (gnus-summary-work-articles n)))
+  (gnus-summary-reply (gnus-summary-work-articles n) wide))
+
+(defun gnus-summary-wide-reply (&optional yank)
+  "Start composing a wide reply mail to the current message.
+If prefix argument YANK is non-nil, the original article is yanked
+automatically."
+  (interactive
+   (list (and current-prefix-arg
+             (gnus-summary-work-articles 1))))
+  (gnus-summary-reply yank t))
+
+(defun gnus-summary-wide-reply-with-original (n)
+  "Start composing a wide reply mail to the current message.
+The original article will be yanked."
+  (interactive "P")
+  (gnus-summary-reply-with-original n t))

 
 

-(defun gnus-summary-mail-forward (&optional post)
-  "Forward the current message to another user."
+(defun gnus-summary-mail-forward (&optional not-used post)
+  "Forward the current message to another user.
+If POST, post instead of mail."

   (interactive "P")
   (interactive "P")

-  (gnus-set-global-variables)

   (gnus-setup-message 'forward
     (gnus-summary-select-article)
   (gnus-setup-message 'forward
     (gnus-summary-select-article)

-    (set-buffer gnus-original-article-buffer)
-    (message-forward post)))
-
-(defun gnus-summary-resend-message (address)
+    (let (text)
+      (save-excursion
+       (set-buffer gnus-original-article-buffer)
+       (setq text (buffer-string)))
+      (set-buffer (gnus-get-buffer-create
+                  (generate-new-buffer-name " *Gnus forward*")))
+      (erase-buffer)
+      (insert text)
+      (run-hooks 'gnus-article-decode-hook)
+      (message-forward post))))
+
+(defun gnus-summary-resend-message (address n)

   "Resend the current article to ADDRESS."
   "Resend the current article to ADDRESS."

-  (interactive "sResend message to: ")
-  (gnus-summary-select-article)
-  (save-excursion
-    (set-buffer gnus-original-article-buffer)
-    (message-resend address)))
+  (interactive "sResend message(s) to: \nP")
+  (let ((articles (gnus-summary-work-articles n))
+       article)
+    (while (setq article (pop articles))
+      (gnus-summary-select-article nil nil nil article)
+      (save-excursion
+       (set-buffer gnus-original-article-buffer)
+       (message-resend address)))))

 
 

-(defun gnus-summary-post-forward ()
-  "Forward the current article to a newsgroup."
-  (interactive)
-  (gnus-summary-mail-forward t))
+(defun gnus-summary-post-forward (&optional full-headers)
+  "Forward the current article to a newsgroup.
+If FULL-HEADERS (the prefix), include full headers when forwarding."
+  (interactive "P")
+  (gnus-summary-mail-forward full-headers t))

 
 

-(defvar gnus-nastygram-message 
-  "The following article was inappropriately posted to %s.\n"
+(defvar gnus-nastygram-message
+  "The following article was inappropriately posted to %s.\n\n"

   "Format string to insert in nastygrams.
 The current group name will be inserted at \"%s\".")
 
 (defun gnus-summary-mail-nastygram (n)
   "Send a nastygram to the author of the current article."
   (interactive "P")
   "Format string to insert in nastygrams.
 The current group name will be inserted at \"%s\".")
 
 (defun gnus-summary-mail-nastygram (n)
   "Send a nastygram to the author of the current article."
   (interactive "P")

-  (if (or gnus-expert-user
-         (gnus-y-or-n-p 
-          "Really send a nastygram to the author of the current article? "))
-      (let ((group gnus-newsgroup-name))
-       (gnus-summary-reply-with-original n)
-       (set-buffer gnus-message-buffer)
-       (insert (format gnus-nastygram-message group))
-       (message-send-and-exit))))
+  (when (or gnus-expert-user
+           (gnus-y-or-n-p
+            "Really send a nastygram to the author of the current article? "))
+    (let ((group gnus-newsgroup-name))
+      (gnus-summary-reply-with-original n)
+      (set-buffer gnus-message-buffer)
+      (message-goto-body)
+      (insert (format gnus-nastygram-message group))
+      (message-send-and-exit))))

 
 (defun gnus-summary-mail-crosspost-complaint (n)
   "Send a complaint about crossposting to the current article(s)."
 
 (defun gnus-summary-mail-crosspost-complaint (n)
   "Send a complaint about crossposting to the current article(s)."


@@ -621,7 +703,8 @@ The current group name will be inserted at \"%s\".")
        (gnus-summary-select-article)
        (set-buffer gnus-original-article-buffer)
        (if (and (<= (length (message-tokenize-header
        (gnus-summary-select-article)
        (set-buffer gnus-original-article-buffer)
        (if (and (<= (length (message-tokenize-header

-                             (setq newsgroups (mail-fetch-field "newsgroups"))
+                             (setq newsgroups
+                                   (mail-fetch-field "newsgroups"))

                              ", "))
                     1)
                 (or (not (setq followup-to (mail-fetch-field "followup-to")))
                              ", "))
                     1)
                 (or (not (setq followup-to (mail-fetch-field "followup-to")))


@@ -633,7 +716,12 @@ The current group name will be inserted at \"%s\".")
          (set-buffer gnus-summary-buffer)
          (gnus-summary-reply-with-original 1)
          (set-buffer gnus-message-buffer)
          (set-buffer gnus-summary-buffer)
          (gnus-summary-reply-with-original 1)
          (set-buffer gnus-message-buffer)

+         (message-goto-body)

          (insert (format gnus-crosspost-complaint newsgroups group))
          (insert (format gnus-crosspost-complaint newsgroups group))

+         (message-goto-subject)
+         (re-search-forward " *$")
+         (replace-match " (crosspost notification)" t t)
+         (gnus-deactivate-mark)

          (when (gnus-y-or-n-p "Send this complaint? ")
            (message-send-and-exit)))))))
 
          (when (gnus-y-or-n-p "Send this complaint? ")
            (message-send-and-exit)))))))
 


@@ -651,7 +739,7 @@ The current group name will be inserted at \"%s\".")
       (setq beg (point))
       (skip-chars-forward "^,")
       (while (zerop
       (setq beg (point))
       (skip-chars-forward "^,")
       (while (zerop

-             (save-excursion 
+             (save-excursion

                (save-restriction
                  (let ((i 0))
                    (narrow-to-region beg (point))
                (save-restriction
                  (let ((i 0))
                    (narrow-to-region beg (point))


@@ -659,31 +747,26 @@ The current group name will be inserted at \"%s\".")
                    (logand (progn
                              (while (search-forward "\"" nil t)
                                (incf i))
                    (logand (progn
                              (while (search-forward "\"" nil t)
                                (incf i))

-                             (if (zerop i) 2 i)) 2)))))
+                             (if (zerop i) 2 i))
+                           2)))))

        (skip-chars-forward ",")
        (skip-chars-forward "^,"))
       (skip-chars-backward " ")
        (skip-chars-forward ",")
        (skip-chars-forward "^,"))
       (skip-chars-backward " ")

-      (setq accumulated
-           (cons (buffer-substring beg (point))
-                 accumulated))
+      (push (buffer-substring beg (point))
+           accumulated)

       (skip-chars-forward "^,")
       (skip-chars-forward ", "))
     accumulated))
 
       (skip-chars-forward "^,")
       (skip-chars-forward ", "))
     accumulated))
 

-(defun gnus-mail-yank-original ()
-  (interactive)
-  (save-excursion
-    (mail-yank-original nil))
-  (or mail-yank-hooks mail-citation-hook
-      (run-hooks 'news-reply-header-hook)))
-

 (defun gnus-inews-add-to-address (group)
   (let ((to-address (mail-fetch-field "to")))
     (when (and to-address
               (gnus-alive-p))
       ;; This mail group doesn't have a `to-list', so we add one
 (defun gnus-inews-add-to-address (group)
   (let ((to-address (mail-fetch-field "to")))
     (when (and to-address
               (gnus-alive-p))
       ;; This mail group doesn't have a `to-list', so we add one

-      ;; here.  Magic!  
-      (gnus-group-add-parameter group (cons 'to-list to-address)))))
+      ;; here.  Magic!
+      (when (gnus-y-or-n-p
+            (format "Do you want to add this as `to-list': %s " to-address))
+       (gnus-group-add-parameter group (cons 'to-list to-address))))))

 
 (defun gnus-put-message ()
   "Put the current message in some group and return to Gnus."
 
 (defun gnus-put-message ()
   "Put the current message in some group and return to Gnus."


@@ -691,17 +774,17 @@ The current group name will be inserted at \"%s\".")
   (let ((reply gnus-article-reply)
        (winconf gnus-prev-winconf)
        (group gnus-newsgroup-name))
   (let ((reply gnus-article-reply)
        (winconf gnus-prev-winconf)
        (group gnus-newsgroup-name))

-    
+

     (or (and group (not (gnus-group-read-only-p group)))
        (setq group (read-string "Put in group: " nil
                                 (gnus-writable-groups))))
     (or (and group (not (gnus-group-read-only-p group)))
        (setq group (read-string "Put in group: " nil
                                 (gnus-writable-groups))))

-    (and (gnus-gethash group gnus-newsrc-hashtb)
-        (error "No such group: %s" group))
+    (when (gnus-gethash group gnus-newsrc-hashtb)
+      (error "No such group: %s" group))

 
     (save-excursion
       (save-restriction
        (widen)
 
     (save-excursion
       (save-restriction
        (widen)

-       (gnus-inews-narrow-to-headers)
+       (message-narrow-to-headers)

        (let (gnus-deletable-headers)
          (if (message-news-p)
              (message-generate-headers message-required-news-headers)
        (let (gnus-deletable-headers)
          (if (message-news-p)
              (message-generate-headers message-required-news-headers)


@@ -712,21 +795,20 @@ The current group name will be inserted at \"%s\".")
 
     (gnus-inews-do-gcc)
 
 
     (gnus-inews-do-gcc)
 

-    (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))))))
+    (when (get-buffer gnus-group-buffer)
+      (when (gnus-buffer-exists-p (car-safe reply))
+       (set-buffer (car reply))
+       (and (cdr reply)
+            (gnus-summary-mark-article-as-replied
+             (cdr reply))))
+      (when winconf
+       (set-window-configuration winconf)))))

 
 (defun gnus-article-mail (yank)
   "Send a reply to the address near point.
 If YANK is non-nil, include the original article."
   (interactive "P")
 
 (defun gnus-article-mail (yank)
   "Send a reply to the address near point.
 If YANK is non-nil, include the original article."
   (interactive "P")

-  (let ((address 
+  (let ((address

         (buffer-substring
          (save-excursion (re-search-backward "[ \t\n]" nil t) (1+ (point)))
          (save-excursion (re-search-forward "[ \t\n]" nil t) (1- (point))))))
         (buffer-substring
          (save-excursion (re-search-backward "[ \t\n]" nil t) (1+ (point)))
          (save-excursion (re-search-forward "[ \t\n]" nil t) (1- (point))))))


@@ -735,6 +817,7 @@ If YANK is non-nil, include the original article."
       (when yank
        (gnus-inews-yank-articles (list (cdr gnus-article-current)))))))
 
       (when yank
        (gnus-inews-yank-articles (list (cdr gnus-article-current)))))))
 

+(defvar nntp-server-type)

 (defun gnus-bug ()
   "Send a bug report to the Gnus maintainers."
   (interactive)
 (defun gnus-bug ()
   "Send a bug report to the Gnus maintainers."
   (interactive)


@@ -742,62 +825,70 @@ If YANK is non-nil, include the original article."
     (error "Gnus has been shut down"))
   (gnus-setup-message 'bug
     (delete-other-windows)
     (error "Gnus has been shut down"))
   (gnus-setup-message 'bug
     (delete-other-windows)

-    (switch-to-buffer "*Gnus Help Bug*")
-    (erase-buffer)
-    (insert gnus-bug-message)
-    (goto-char (point-min))
+    (when gnus-bug-create-help-buffer
+      (switch-to-buffer "*Gnus Help Bug*")
+      (erase-buffer)
+      (insert gnus-bug-message)
+      (goto-char (point-min)))

     (message-pop-to-buffer "*Gnus Bug*")
     (message-setup `((To . ,gnus-maintainer) (Subject . "")))
     (message-pop-to-buffer "*Gnus Bug*")
     (message-setup `((To . ,gnus-maintainer) (Subject . "")))

-    (push `(gnus-bug-kill-buffer) message-send-actions)
+    (when gnus-bug-create-help-buffer
+      (push `(gnus-bug-kill-buffer) message-send-actions))

     (goto-char (point-min))
     (re-search-forward (concat "^" (regexp-quote mail-header-separator) "$"))
     (forward-line 1)
     (goto-char (point-min))
     (re-search-forward (concat "^" (regexp-quote mail-header-separator) "$"))
     (forward-line 1)

-    (insert (gnus-version) "\n")
-    (insert (emacs-version))
+    (insert (gnus-version) "\n"
+           (emacs-version) "\n")
+    (when (and (boundp 'nntp-server-type)
+              (stringp nntp-server-type))
+      (insert nntp-server-type))

     (insert "\n\n\n\n\n")
     (insert "\n\n\n\n\n")

-    (gnus-debug)
+    (save-excursion
+      (set-buffer (gnus-get-buffer-create " *gnus environment info*"))
+      (gnus-debug))
+    (insert "<#part type=application/x-emacs-lisp buffer=\" *gnus environment info*\" disposition=inline description=\"User settings\"><#/part>")

     (goto-char (point-min))
     (search-forward "Subject: " nil t)
     (message "")))
 
 (defun gnus-bug-kill-buffer ()
     (goto-char (point-min))
     (search-forward "Subject: " nil t)
     (message "")))
 
 (defun gnus-bug-kill-buffer ()

-  (and (get-buffer "*Gnus Help Bug*")
-       (kill-buffer "*Gnus Help Bug*")))
+  (when (get-buffer "*Gnus Help Bug*")
+    (kill-buffer "*Gnus Help Bug*")))

 
 (defun gnus-debug ()
 
 (defun gnus-debug ()

-  "Attemps to go through the Gnus source file and report what variables have been changed.
+  "Attempts to go through the Gnus source file and report what variables have been changed.

 The source file has to be in the Emacs load path."
   (interactive)
 The source file has to be in the Emacs load path."
   (interactive)

-  (let ((files '("gnus-load.el" "gnus-sum.el" "gnus-group.el"
-                "gnus-art.el" "gnus-start.el"
-                "gnus-msg.el" "gnus-score.el" "gnus-win.el"
+  (let ((files '("gnus.el" "gnus-sum.el" "gnus-group.el"
+                "gnus-art.el" "gnus-start.el" "gnus-async.el"
+                "gnus-msg.el" "gnus-score.el" "gnus-win.el" "gnus-topic.el"

                 "nnmail.el" "message.el"))
                 "nnmail.el" "message.el"))

+       (point (point))

        file expr olist sym)
     (gnus-message 4 "Please wait while we snoop your variables...")
     (sit-for 0)
     ;; Go through all the files looking for non-default values for variables.
     (save-excursion
        file expr olist sym)
     (gnus-message 4 "Please wait while we snoop your variables...")
     (sit-for 0)
     ;; Go through all the files looking for non-default values for variables.
     (save-excursion

-      (set-buffer (get-buffer-create " *gnus bug info*"))
-      (buffer-disable-undo (current-buffer))
+      (set-buffer (gnus-get-buffer-create " *gnus bug info*"))

       (while files
        (erase-buffer)
       (while files
        (erase-buffer)

-       (when (file-exists-p (setq file (locate-library (pop files))))
+       (when (and (setq file (locate-library (pop files)))
+                  (file-exists-p file))

          (insert-file-contents file)
          (goto-char (point-min))
          (if (not (re-search-forward "^;;* *Internal variables" nil t))
              (gnus-message 4 "Malformed sources in file %s" file)
            (narrow-to-region (point-min) (point))
            (goto-char (point-min))
          (insert-file-contents file)
          (goto-char (point-min))
          (if (not (re-search-forward "^;;* *Internal variables" nil t))
              (gnus-message 4 "Malformed sources in file %s" file)
            (narrow-to-region (point-min) (point))
            (goto-char (point-min))

-           (while (setq expr (condition-case () 
-                                 (read (current-buffer)) (error nil)))
-             (condition-case ()
-                 (and (eq (car expr) 'defvar)
-                      (stringp (nth 3 expr))
-                      (or (not (boundp (nth 1 expr)))
-                          (not (equal (eval (nth 2 expr))
-                                      (symbol-value (nth 1 expr)))))
-                      (push (nth 1 expr) olist))
-               (error nil))))))
+           (while (setq expr (ignore-errors (read (current-buffer))))
+             (ignore-errors
+               (and (or (eq (car expr) 'defvar)
+                        (eq (car expr) 'defcustom))
+                    (stringp (nth 3 expr))
+                    (or (not (boundp (nth 1 expr)))
+                        (not (equal (eval (nth 2 expr))
+                                    (symbol-value (nth 1 expr)))))
+                    (push (nth 1 expr) olist)))))))

       (kill-buffer (current-buffer)))
     (when (setq olist (nreverse olist))
       (insert "------------------ Environment follows ------------------\n\n"))
       (kill-buffer (current-buffer)))
     (when (setq olist (nreverse olist))
       (insert "------------------ Environment follows ------------------\n\n"))


@@ -817,11 +908,12 @@ The source file has to be in the Emacs load path."
        (insert ";; (makeunbound '" (symbol-name (car olist)) ")\n"))
       (setq olist (cdr olist)))
     (insert "\n\n")
        (insert ";; (makeunbound '" (symbol-name (car olist)) ")\n"))
       (setq olist (cdr olist)))
     (insert "\n\n")

-    ;; Remove any null chars - they seem to cause trouble for some
-    ;; mailers. (Byte-compiled output from the stuff above.) 
-    (goto-char (point-min))
-    (while (re-search-forward "[\000\200]" nil t)
-      (replace-match "" t t))))
+    ;; Remove any control chars - they seem to cause trouble for some
+    ;; mailers.  (Byte-compiled output from the stuff above.)
+    (goto-char point)
+    (while (re-search-forward "[\000-\010\013-\037\200-\237]" nil t)
+      (replace-match (format "\\%03o" (string-to-char (match-string 0)))
+                    t t))))

 
 ;;; Treatment of rejected articles.
 ;;; Bounced mail.
 
 ;;; Treatment of rejected articles.
 ;;; Bounced mail.


@@ -840,15 +932,16 @@ this is a reply."
     (let* ((references (mail-fetch-field "references"))
           (parent (and references (gnus-parent-id references))))
       (message-bounce)
     (let* ((references (mail-fetch-field "references"))
           (parent (and references (gnus-parent-id references))))
       (message-bounce)

-      ;; If there are references, we fetch the article we answered to.  
+      ;; If there are references, we fetch the article we answered to.

       (and fetch parent
           (gnus-summary-refer-article parent)
           (gnus-summary-show-all-headers)))))
 
 ;;; Gcc handling.
 
       (and fetch parent
           (gnus-summary-refer-article parent)
           (gnus-summary-show-all-headers)))))
 
 ;;; Gcc handling.
 

-;; Do Gcc handling, which copied the message over to some group. 
+;; Do Gcc handling, which copied the message over to some group.

 (defun gnus-inews-do-gcc (&optional gcc)
 (defun gnus-inews-do-gcc (&optional gcc)

+  (interactive)

   (when (gnus-alive-p)
     (save-excursion
       (save-restriction
   (when (gnus-alive-p)
     (save-excursion
       (save-restriction


@@ -862,11 +955,11 @@ this is a reply."
            (setq groups (message-tokenize-header gcc " ,"))
            ;; Copy the article over to some group(s).
            (while (setq group (pop groups))
            (setq groups (message-tokenize-header gcc " ,"))
            ;; Copy the article over to some group(s).
            (while (setq group (pop groups))

-             (gnus-check-server 
+             (gnus-check-server

               (setq method
                     (cond ((and (null (gnus-get-info group))
                                 (eq (car gnus-message-archive-method)
               (setq method
                     (cond ((and (null (gnus-get-info group))
                                 (eq (car gnus-message-archive-method)

-                                    (car 
+                                    (car

                                      (gnus-server-to-method
                                       (gnus-group-method group)))))
                            ;; If the group doesn't exist, we assume
                                      (gnus-server-to-method
                                       (gnus-group-method group)))))
                            ;; If the group doesn't exist, we assume


@@ -883,13 +976,17 @@ this is a reply."
              (save-excursion
                (nnheader-set-temp-buffer " *acc*")
                (insert-buffer-substring cur)
              (save-excursion
                (nnheader-set-temp-buffer " *acc*")
                (insert-buffer-substring cur)

+               (message-encode-message-body)
+               (save-restriction
+                 (message-narrow-to-headers)
+                 (mail-encode-encoded-word-buffer))

                (goto-char (point-min))
                (goto-char (point-min))

-               (when (re-search-forward 
+               (when (re-search-forward

                       (concat "^" (regexp-quote mail-header-separator) "$")
                       nil t)
                  (replace-match "" t t ))
                       (concat "^" (regexp-quote mail-header-separator) "$")
                       nil t)
                  (replace-match "" t t ))

-               (unless (gnus-request-accept-article group method t)
-                 (gnus-message 1 "Couldn't store article in group %s: %s" 
+               (unless (gnus-request-accept-article group method t t)
+                 (gnus-message 1 "Couldn't store article in group %s: %s"

                                group (gnus-status-message method))
                  (sit-for 2))
                (kill-buffer (current-buffer))))))))))
                                group (gnus-status-message method))
                  (sit-for 2))
                (kill-buffer (current-buffer))))))))))


@@ -898,9 +995,9 @@ this is a reply."
   "Insert Gcc headers based on `gnus-outgoing-message-group'."
   (save-excursion
     (save-restriction
   "Insert Gcc headers based on `gnus-outgoing-message-group'."
   (save-excursion
     (save-restriction

-      (gnus-inews-narrow-to-headers)
+      (message-narrow-to-headers)

       (let* ((group gnus-outgoing-message-group)
       (let* ((group gnus-outgoing-message-group)

-            (gcc (cond 
+            (gcc (cond

                   ((gnus-functionp group)
                    (funcall group))
                   ((or (stringp group) (list group))
                   ((gnus-functionp group)
                    (funcall group))
                   ((or (stringp group) (list group))


@@ -915,10 +1012,13 @@ this is a reply."
   "Insert the Gcc to say where the article is to be archived."
   (let* ((var gnus-message-archive-group)
         (group (or group gnus-newsgroup-name ""))
   "Insert the Gcc to say where the article is to be archived."
   (let* ((var gnus-message-archive-group)
         (group (or group gnus-newsgroup-name ""))

+        (gcc-self-val
+         (and gnus-newsgroup-name
+              (gnus-group-find-parameter
+               gnus-newsgroup-name 'gcc-self)))

         result
         result

-        gcc-self-val

         (groups
         (groups

-         (cond 
+         (cond

           ((null gnus-message-archive-method)
            ;; Ignore.
            nil)
           ((null gnus-message-archive-method)
            ;; Ignore.
            nil)


@@ -939,7 +1039,7 @@ this is a reply."
            (while (and var
                        (not
                         (setq result
            (while (and var
                        (not
                         (setq result

-                              (cond 
+                              (cond

                                ((stringp (caar var))
                                 ;; Regexp.
                                 (when (string-match (caar var) group)
                                ((stringp (caar var))
                                 ;; Regexp.
                                 (when (string-match (caar var) group)


@@ -952,19 +1052,17 @@ this is a reply."
              (setq var (cdr var)))
            result)))
         name)
              (setq var (cdr var)))
            result)))
         name)

-    (when groups
+    (when (or groups gcc-self-val)

       (when (stringp groups)
        (setq groups (list groups)))
       (save-excursion
        (save-restriction
       (when (stringp groups)
        (setq groups (list groups)))
       (save-excursion
        (save-restriction

-         (gnus-inews-narrow-to-headers)
+         (message-narrow-to-headers)

          (goto-char (point-max))
          (insert "Gcc: ")
          (goto-char (point-max))
          (insert "Gcc: ")

-         (if (and gnus-newsgroup-name
-                  (setq gcc-self-val
-                        (gnus-group-find-parameter
-                         gnus-newsgroup-name 'gcc-self)))
-             (progn 
+         (if gcc-self-val
+             ;; Use the `gcc-self' param value instead.
+             (progn

                (insert
                 (if (stringp gcc-self-val)
                     gcc-self-val
                (insert
                 (if (stringp gcc-self-val)
                     gcc-self-val


@@ -974,40 +1072,132 @@ this is a reply."
                  (progn
                    (beginning-of-line)
                    (kill-line))))
                  (progn
                    (beginning-of-line)
                    (kill-line))))

+           ;; Use the list of groups.

            (while (setq name (pop groups))
              (insert (if (string-match ":" name)
                          name
            (while (setq name (pop groups))
              (insert (if (string-match ":" name)
                          name

-                       (gnus-group-prefixed-name 
+                       (gnus-group-prefixed-name

                         name gnus-message-archive-method)))
                         name gnus-message-archive-method)))

-             (if groups (insert " ")))
+             (when groups
+               (insert " ")))

            (insert "\n")))))))
 
            (insert "\n")))))))
 

-(defun gnus-summary-send-draft ()
-  "Enter a mail/post buffer to edit and send the draft."
-  (interactive)
-  (gnus-set-global-variables)
-  (let (buf)
-    (if (not (setq buf (gnus-request-restore-buffer 
-                       (gnus-summary-article-number) gnus-newsgroup-name)))
-       (error "Couldn't restore the article")
-      (switch-to-buffer buf)
-      (when (eq major-mode 'news-reply-mode)
-       (local-set-key "\C-c\C-c" 'gnus-inews-news))
-      ;; Insert the separator.
-      (goto-char (point-min))
-      (search-forward "\n\n")
-      (forward-char -1)
-      (insert mail-header-separator)
-      ;; Configure windows.
-      (let ((gnus-draft-buffer (current-buffer)))
-       (gnus-configure-windows 'draft t)
-       (goto-char (point))))))
-  
-(gnus-add-shutdown 'gnus-inews-close 'gnus)
-
-(defun gnus-inews-close ()
-  (setq gnus-inews-sent-ids nil))
-  
+;;; Posting styles.
+
+(defun gnus-configure-posting-styles ()
+  "Configure posting styles according to `gnus-posting-styles'."
+  (unless gnus-inhibit-posting-styles
+    (let ((group (or gnus-newsgroup-name ""))
+         (styles gnus-posting-styles)
+         style match variable attribute value v styles results
+         filep name address element)
+      ;; If the group has a posting-style parameter, add it at the end with a
+      ;; regexp matching everything, to be sure it takes precedence over all
+      ;; the others.
+      (when gnus-newsgroup-name
+       (let ((tmp-style (gnus-group-find-parameter group 'posting-style t)))
+         (when tmp-style
+           (setq styles (append styles (list (cons ".*" tmp-style)))))))
+      ;; Go through all styles and look for matches.
+      (dolist (style styles)
+       (setq match (pop style))
+       (when (cond
+              ((stringp match)
+               ;; Regexp string match on the group name.
+               (string-match match gnus-newsgroup-name))
+              ((or (symbolp match)
+                   (gnus-functionp match))
+               (cond
+                ((gnus-functionp match)
+                 ;; Function to be called.
+                 (funcall match))
+                ((boundp match)
+                 ;; Variable to be checked.
+                 (symbol-value match))))
+              ((listp match)
+               ;; This is a form to be evaled.
+               (eval match)))
+         ;; We have a match, so we set the variables.
+         (dolist (attribute style)
+           (setq element (pop attribute)
+                 variable nil
+                 filep nil)
+           (setq value
+                 (cond
+                  ((eq (car attribute) :file)
+                   (setq filep t)
+                   (cadr attribute))
+                  ((eq (car attribute) :value)
+                   (cadr attribute))
+                  (t
+                   (car attribute))))
+           ;; We get the value.
+           (setq v
+                 (cond
+                  ((stringp value)
+                   value)
+                  ((or (symbolp value)
+                       (gnus-functionp value))
+                   (cond ((gnus-functionp value)
+                          (funcall value))
+                         ((boundp value)
+                          (symbol-value value))))
+                  ((listp value)
+                   (eval value))))
+           ;; Translate obsolescent value.
+           (when (eq element 'signature-file)
+             (setq element 'signature
+                   filep t))
+           ;; Get the contents of file elems.
+           (when filep
+             (setq v (with-temp-buffer
+                       (insert-file-contents v)
+                       (buffer-string))))
+           (setq results (delq (assoc element results) results))
+           (push (cons element
+                       v) results))))
+      ;; Now we have all the styles, so we insert them.
+      (setq name (assq 'name results)
+           address (assq 'address results))
+      (setq results (delq name (delq address results)))
+      (make-local-variable 'message-setup-hook)
+      (dolist (result results)
+       (when (cdr result)
+         (add-hook 'message-setup-hook
+                   (cond
+                    ((eq 'body (car result))
+                     `(lambda ()
+                        (save-excursion
+                          (message-goto-body)
+                          (insert ,(cdr result)))))
+                    ((eq 'signature (car result))
+                     (set (make-local-variable 'message-signature) nil)
+                     (set (make-local-variable 'message-signature-file) nil)
+                     `(lambda ()
+                        (save-excursion
+                          (let ((message-signature ,(cdr result)))
+                            (message-insert-signature)))))
+                    (t
+                     (let ((header
+                            (if (symbolp (car result))
+                                (capitalize (symbol-name (car result)))
+                              (car result))))
+                       `(lambda ()
+                          (save-excursion
+                            (message-remove-header ,header)
+                            (message-goto-eoh)
+                            (insert ,header ": " ,(cdr result) "\n")))))))))
+      (when (or name address)
+       (add-hook 'message-setup-hook
+                 `(lambda ()
+                    (let ((user-full-name ,(or (cdr name) user-full-name))
+                          (user-mail-address
+                           ,(or (cdr address) user-mail-address)))
+                      (save-excursion
+                        (message-remove-header "From")
+                        (message-goto-eoh)
+                        (insert "From: " (message-make-from) "\n")))))))))
+

 ;;; Allow redefinition of functions.
 
 (gnus-ems-redefine)
 ;;; Allow redefinition of functions.
 
 (gnus-ems-redefine)