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

[Miles Bader]

Index: emacs/lisp/gnus/gnus.el
diff -c emacs/lisp/gnus/gnus.el:1.47 emacs/lisp/gnus/gnus.el:1.48
*** emacs/lisp/gnus/gnus.el:1.47        Wed Aug 31 13:06:08 2005
--- emacs/lisp/gnus/gnus.el     Mon Sep  5 23:58:08 2005
***************
*** 2343,2349 ****
    "Function run when a group level is changed.
  It is called with three parameters -- GROUP, LEVEL and OLDLEVEL."
    :group 'gnus-group-levels
!   :type 'function)
  
  ;;; Face thingies.
  
--- 2343,2350 ----
    "Function run when a group level is changed.
  It is called with three parameters -- GROUP, LEVEL and OLDLEVEL."
    :group 'gnus-group-levels
!   :type '(choice (const nil)
!                function))
  
  ;;; Face thingies.
  
***************
*** 2472,2495 ****
                         (symbol :tag "Parameter")
                         (sexp :tag "Value")))))
  
! (defcustom gnus-user-agent 'emacs-gnus-type
    "Which information should be exposed in the User-Agent header.
  
! It can be one of the symbols `gnus' \(show only Gnus version\), `emacs-gnus'
! \(show only Emacs and Gnus versions\), `emacs-gnus-config' \(same as
! `emacs-gnus' plus system configuration\), `emacs-gnus-type' \(same as
! `emacs-gnus' plus system type\) or a custom string.  If you set it to a
! string, be sure to use a valid format, see RFC 2616."
    :version "22.1"
    :group 'gnus-message
!   :type '(choice
!         (item :tag "Show Gnus and Emacs versions and system type"
!               emacs-gnus-type)
!         (item :tag "Show Gnus and Emacs versions and system configuration"
!               emacs-gnus-config)
!         (item :tag "Show Gnus and Emacs versions" emacs-gnus)
!         (item :tag "Show only Gnus version" gnus)
!         (string :tag "Other")))
  
  
  ;;; Internal variables
--- 2473,2517 ----
                         (symbol :tag "Parameter")
                         (sexp :tag "Value")))))
  
! (defcustom gnus-user-agent '(emacs gnus type)
    "Which information should be exposed in the User-Agent header.
  
! Can be a list of symbols or a string.  Valid symbols are `gnus'
! \(show Gnus version\) and `emacs' \(show Emacs version\).  In
! addition to the Emacs version, you can add `codename' \(show
! \(S\)XEmacs codename\) or either `config' \(show system
! configuration\) or `type' \(show system type\).  If you set it to
! a string, be sure to use a valid format, see RFC 2616."
! 
    :version "22.1"
    :group 'gnus-message
!   :type '(choice (list (set :inline t
!                           (const gnus  :tag "Gnus version")
!                           (const emacs :tag "Emacs version")
!                           (choice :tag "system"
!                                   (const type   :tag "system type")
!                                   (const config :tag "system configuration"))
!                           (const codename :tag "Emacs codename")))
!                (string)))
! 
! ;; Convert old (No Gnus < 2005-01-10, v5-10 < 2005-09-05) symbol type values:
! (when (symbolp gnus-user-agent)
!   (setq gnus-user-agent
!       (cond ((eq gnus-user-agent 'emacs-gnus-config)
!              '(emacs gnus config))
!             ((eq gnus-user-agent 'emacs-gnus-type)
!              '(emacs gnus type))
!             ((eq gnus-user-agent 'emacs-gnus)
!              '(emacs gnus))
!             ((eq gnus-user-agent 'gnus)
!              '(gnus))
!             (t gnus-user-agent)))
!   (gnus-message 1 "Converted `gnus-user-agent' to `%s'." gnus-user-agent)
!   (sit-for 1)
!   (if (get 'gnus-user-agent 'saved-value)
!       (customize-save-variable 'gnus-user-agent gnus-user-agent)
!     (gnus-message 1 "Edit your init file to make this change permanent.")
!     (sit-for 2)))
  
  
  ;;; Internal variables