[Emacs-diffs] Changes to emacs/lisp/gnus/gnus-msg.el

[Miles Bader]

Index: emacs/lisp/gnus/gnus-msg.el
diff -c emacs/lisp/gnus/gnus-msg.el:1.33 emacs/lisp/gnus/gnus-msg.el:1.34
*** emacs/lisp/gnus/gnus-msg.el:1.33    Sat Aug  6 19:51:41 2005
--- emacs/lisp/gnus/gnus-msg.el Mon Sep  5 23:58:08 2005
***************
*** 67,74 ****
  current newsgroup name and then returns a suitable group name (or list
  of names)."
    :group 'gnus-message
!   :type '(choice (string :tag "Group")
!                (function)))
  
  (defcustom gnus-mailing-list-groups nil
    "*If non-nil a regexp matching groups that are really mailing lists.
--- 67,76 ----
  current newsgroup name and then returns a suitable group name (or list
  of names)."
    :group 'gnus-message
!   :type '(choice (const nil)
!                (function)
!                (string :tag "Group")
!                (repeat :tag "List of groups" (string :tag "Group"))))
  
  (defcustom gnus-mailing-list-groups nil
    "*If non-nil a regexp matching groups that are really mailing lists.
***************
*** 1031,1047 ****
    "Stringified Gnus version and Emacs version.
  See the variable `gnus-user-agent'."
    (interactive)
!   (let* ((float-output-format nil)
!        (gnus-v
!         (concat "Gnus/"
!                 (prin1-to-string (gnus-continuum-version gnus-version) t)
!                 " (" gnus-version ")"))
!        (emacs-v (gnus-emacs-version)))
!     (if (stringp gnus-user-agent)
!       gnus-user-agent
!       (concat gnus-v
!             (when emacs-v
!               (concat " " emacs-v))))))
  
  
  ;;;
--- 1033,1050 ----
    "Stringified Gnus version and Emacs version.
  See the variable `gnus-user-agent'."
    (interactive)
!   (if (stringp gnus-user-agent)
!       gnus-user-agent
!     ;; `gnus-user-agent' is a list:
!     (let* ((float-output-format nil)
!          (gnus-v
!           (when (memq 'gnus gnus-user-agent)
!             (concat "Gnus/"
!                     (prin1-to-string (gnus-continuum-version gnus-version) t)
!                     " (" gnus-version ")")))
!          (emacs-v (gnus-emacs-version)))
!       (concat gnus-v (when (and gnus-v emacs-v) " ")
!             emacs-v))))
  
  
  ;;;
***************
*** 1661,1667 ****
             (gcc (cond
                   ((functionp group)
                    (funcall group))
!                  ((or (stringp group) (list group))
                    group))))
        (when gcc
          (insert "Gcc: "
--- 1664,1670 ----
             (gcc (cond
                   ((functionp group)
                    (funcall group))
!                  ((or (stringp group) (listp group))
                    group))))
        (when gcc
          (insert "Gcc: "