Add requires and fix history for iswitchb

[gnus] / lisp / gnus-msg.el

diff --git a/lisp/gnus-msg.el b/lisp/gnus-msg.el
index 555b6a0..a3794f2 100644 (file)
--- a/lisp/gnus-msg.el
+++ b/lisp/gnus-msg.el
@@ -1,7 +1,7 @@
 ;;; gnus-msg.el --- mail and post interface for Gnus
 
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-;;   2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+;;   2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 
 ;; Author: Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
 ;;     Lars Magne Ingebrigtsen <larsi@gnus.org>
@@ -149,7 +149,7 @@ See Info node `(gnus)Posting Styles'."
   :type 'boolean)
 
 (make-obsolete-variable 'gnus-inews-mark-gcc-as-read
-                       'gnus-gcc-mark-as-read)
+                       'gnus-gcc-mark-as-read "Emacs 22.1")
 
 (defcustom gnus-gcc-externalize-attachments nil
   "Should local-file attachments be included as external parts in Gcc copies?
@@ -578,8 +578,8 @@ If ARG is 1, prompt for a group name to find the posting style."
                (if arg
                    (if (= 1 (prefix-numeric-value arg))
                        (gnus-group-completing-read
-                        "Use posting style of group: "
-                        nil nil (gnus-read-active-file-p))
+                        "Use posting style of group"
+                        nil (gnus-read-active-file-p))
                      (gnus-group-group-name))
                  ""))
          ;; #### see comment in gnus-setup-message -- drv
@@ -607,8 +607,8 @@ network.  The corresponding back end must have a 'request-post method."
          (setq gnus-newsgroup-name
                (if arg
                    (if (= 1 (prefix-numeric-value arg))
-                       (gnus-group-completing-read "Use group: "
-                                                   nil nil
+                       (gnus-group-completing-read "Use group"
+                                                   nil
                                                    (gnus-read-active-file-p))
                      (gnus-group-group-name))
                  ""))
@@ -628,7 +628,7 @@ a news."
   (let ((gnus-newsgroup-name
         (if arg
             (if (= 1 (prefix-numeric-value arg))
-                (gnus-group-completing-read "Newsgroup: " nil nil
+                (gnus-group-completing-read "Newsgroup" nil
                                             (gnus-read-active-file-p))
               (gnus-group-group-name))
           ""))
@@ -654,8 +654,8 @@ posting style."
          (setq gnus-newsgroup-name
                (if arg
                    (if (= 1 (prefix-numeric-value arg))
-                       (gnus-group-completing-read "Use group: "
-                                                   nil nil
+                       (gnus-group-completing-read "Use group"
+                                                   nil
                                                    (gnus-read-active-file-p))
                      "")
                  gnus-newsgroup-name))
@@ -684,8 +684,8 @@ network.  The corresponding back end must have a 'request-post method."
          (setq gnus-newsgroup-name
                (if arg
                    (if (= 1 (prefix-numeric-value arg))
-                       (gnus-group-completing-read "Use group: "
-                                                   nil nil
+                       (gnus-group-completing-read "Use group"
+                                                   nil
                                                    (gnus-read-active-file-p))
                      "")
                  gnus-newsgroup-name))
@@ -710,7 +710,7 @@ a news."
   (let ((gnus-newsgroup-name
         (if arg
             (if (= 1 (prefix-numeric-value arg))
-                (gnus-group-completing-read "Newsgroup: " nil nil
+                (gnus-group-completing-read "Newsgroup" nil
                                             (gnus-read-active-file-p))
               "")
           gnus-newsgroup-name))
@@ -1028,8 +1028,8 @@ If SILENT, don't prompt the user."
                         gnus-last-posting-server)
                    ;; Just use the last value.
                    gnus-last-posting-server
-                 (completing-read
-                  "Posting method: " method-alist nil t
+                 (gnus-completing-read
+                  "Posting method" (mapcar 'car method-alist) t
                   (cons (or gnus-last-posting-server "") 0))))
          method-alist))))
      ;; Override normal method.
@@ -1487,7 +1487,7 @@ If YANK is non-nil, include the original article."
 (defun gnus-summary-yank-message (buffer n)
   "Yank the current article into a composed message."
   (interactive
-   (list (completing-read "Buffer: " (mapcar 'list (message-buffers)) nil t)
+   (list (gnus-completing-read "Buffer" (message-buffers) t)
         current-prefix-arg))
   (gnus-summary-iterate n
     (let ((gnus-inhibit-treatment t))
@@ -1677,6 +1677,11 @@ this is a reply."
                                    group method t t))))
                (gnus-message 1 "Couldn't store article in group %s: %s"
                              group (gnus-status-message method)))
+             (when (stringp method)
+               (setq method (gnus-server-to-method method)))
+             (when (and (listp method)
+                        (gnus-native-method-p method))
+               (setq group (gnus-group-short-name group)))
              (when (and group-art
                         ;; FIXME: Should gcc-mark-as-read work when
                         ;; Gnus is not running?
@@ -1984,5 +1989,4 @@ this is a reply."
 
 (provide 'gnus-msg)
 
-;; arch-tag: 9f22b2f5-1c0a-49de-916e-4c88e984852b
 ;;; gnus-msg.el ends here