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

[Kim F . Storm]

Index: emacs/lisp/gnus/gnus.el
diff -c emacs/lisp/gnus/gnus.el:1.36 emacs/lisp/gnus/gnus.el:1.37
*** emacs/lisp/gnus/gnus.el:1.36        Mon Nov  1 23:06:34 2004
--- emacs/lisp/gnus/gnus.el     Wed Feb  9 15:50:37 2005
***************
*** 964,970 ****
       (\"mail\\\\.me\" (gnus-use-scoring  t))
       (\"list\\\\..*\" (total-expire . t)
                  (broken-reply-to . t)))"
!   :version "21.4"
    :group 'gnus-group-various
    :type '(repeat (cons regexp
                       (repeat sexp))))
--- 964,970 ----
       (\"mail\\\\.me\" (gnus-use-scoring  t))
       (\"list\\\\..*\" (total-expire . t)
                  (broken-reply-to . t)))"
!   :version "22.1"
    :group 'gnus-group-various
    :type '(repeat (cons regexp
                       (repeat sexp))))
***************
*** 1314,1320 ****
                        (gnus-replace-in-string name "\\." "-") 
"-charter.html")))
    "*An alist of (HIERARCHY . FORM) pairs used to construct the URL of a 
charter.
  When FORM is evaluated `name' is bound to the name of the group."
!   :version "21.4"
    :group 'gnus-group-various
    :type '(repeat (cons (string :tag "Hierarchy") (sexp :tag "Form"))))
  
--- 1314,1320 ----
                        (gnus-replace-in-string name "\\." "-") 
"-charter.html")))
    "*An alist of (HIERARCHY . FORM) pairs used to construct the URL of a 
charter.
  When FORM is evaluated `name' is bound to the name of the group."
!   :version "22.1"
    :group 'gnus-group-various
    :type '(repeat (cons (string :tag "Hierarchy") (sexp :tag "Form"))))
  
***************
*** 1322,1328 ****
    "*Non-nil means that control messages are displayed using `browse-url'.
  Otherwise they are fetched with ange-ftp and displayed in an ephemeral
  group."
!   :version "21.4"
    :group 'gnus-group-various
    :type 'boolean)
  
--- 1322,1328 ----
    "*Non-nil means that control messages are displayed using `browse-url'.
  Otherwise they are fetched with ange-ftp and displayed in an ephemeral
  group."
!   :version "22.1"
    :group 'gnus-group-various
    :type 'boolean)
  
***************
*** 1781,1787 ****
                  (list
                   (regexp :tag "Group Name Regular Expression")
                   (boolean :tag "Ignored")))
!  
   :parameter-type '(boolean :tag "Group Ignored by the Registry")
   :parameter-document
   "Whether the Gnus Registry should ignore this group.")
--- 1781,1787 ----
                  (list
                   (regexp :tag "Group Name Regular Expression")
                   (boolean :tag "Ignored")))
! 
   :parameter-type '(boolean :tag "Group Ignored by the Registry")
   :parameter-document
   "Whether the Gnus Registry should ignore this group.")
***************
*** 1790,1796 ****
  (defcustom gnus-install-group-spam-parameters t
    "*Disable the group parameters for spam detection.
  Enable if `G c' in XEmacs is giving you trouble, and make sure to submit a 
bug report."
!   :version "21.4"
    :type 'boolean
    :group 'gnus-start)
  
--- 1790,1796 ----
  (defcustom gnus-install-group-spam-parameters t
    "*Disable the group parameters for spam detection.
  Enable if `G c' in XEmacs is giving you trouble, and make sure to submit a 
bug report."
!   :version "22.1"
    :type 'boolean
    :group 'gnus-start)
  
***************
*** 1891,1898 ****
    (gnus-define-group-parameter
     spam-process
     :type list
!    :parameter-type 
!    '(choice 
       :tag "Spam Summary Exit Processor"
       :value nil
       (list :tag "Spam Summary Exit Processor Choices"
--- 1891,1898 ----
    (gnus-define-group-parameter
     spam-process
     :type list
!    :parameter-type
!    '(choice
       :tag "Spam Summary Exit Processor"
       :value nil
       (list :tag "Spam Summary Exit Processor Choices"
***************
*** 1933,1943 ****
  name regexps that should match all groups in which to do automatic
  spam processing, associated with the appropriate processor."
     :variable-group spam
!    :variable-type 
     '(repeat :tag "Spam/Ham Processors"
            (list :tag "Spam Summary Exit Processor Choices"
                  (regexp :tag "Group Regexp")
!                 (set 
                   :tag "Spam/Ham Summary Exit Processor"
                   (variable-item gnus-group-spam-exit-processor-ifile)
                   (variable-item gnus-group-spam-exit-processor-stat)
--- 1933,1943 ----
  name regexps that should match all groups in which to do automatic
  spam processing, associated with the appropriate processor."
     :variable-group spam
!    :variable-type
     '(repeat :tag "Spam/Ham Processors"
            (list :tag "Spam Summary Exit Processor Choices"
                  (regexp :tag "Group Regexp")
!                 (set
                   :tag "Spam/Ham Summary Exit Processor"
                   (variable-item gnus-group-spam-exit-processor-ifile)
                   (variable-item gnus-group-spam-exit-processor-stat)
***************
*** 1972,1978 ****
    (gnus-define-group-parameter
     spam-autodetect
     :type list
!    :parameter-type 
     '(boolean :tag "Spam autodetection")
     :function-document
     "Should spam be autodetected (with spam-split) in this group?"
--- 1972,1978 ----
    (gnus-define-group-parameter
     spam-autodetect
     :type list
!    :parameter-type
     '(boolean :tag "Spam autodetection")
     :function-document
     "Should spam be autodetected (with spam-split) in this group?"
***************
*** 1983,1989 ****
     Only unseen articles will be examined, unless
     spam-autodetect-recheck-messages is set."
     :variable-group spam
!    :variable-type 
     '(repeat
       :tag "Autodetection setting"
       (list
--- 1983,1989 ----
     Only unseen articles will be examined, unless
     spam-autodetect-recheck-messages is set."
     :variable-group spam
!    :variable-type
     '(repeat
       :tag "Autodetection setting"
       (list
***************
*** 1997,2003 ****
    (gnus-define-group-parameter
     spam-autodetect-methods
     :type list
!    :parameter-type 
     '(choice :tag "Spam autodetection-specific methods"
       (const none)
       (const default)
--- 1997,2003 ----
    (gnus-define-group-parameter
     spam-autodetect-methods
     :type list
!    :parameter-type
     '(choice :tag "Spam autodetection-specific methods"
       (const none)
       (const default)
***************
*** 2024,2030 ****
  will be examined, unless spam-autodetect-recheck-messages is
  set."
     :variable-group spam
!    :variable-type 
     '(repeat
       :tag "Autodetection methods"
       (list
--- 2024,2030 ----
  will be examined, unless spam-autodetect-recheck-messages is
  set."
     :variable-group spam
!    :variable-type
     '(repeat
       :tag "Autodetection methods"
       (list
***************
*** 2046,2052 ****
        (variable-item spam-use-bogofilter-headers)
        (variable-item spam-use-bogofilter)))))
       :parameter-document
!    "Spam autodetection methods.  
  Requires the spam-autodetect parameter.  Only unseen articles
  will be examined, unless spam-autodetect-recheck-messages is
  set.")
--- 2046,2052 ----
        (variable-item spam-use-bogofilter-headers)
        (variable-item spam-use-bogofilter)))))
       :parameter-document
!    "Spam autodetection methods.
  Requires the spam-autodetect parameter.  Only unseen articles
  will be examined, unless spam-autodetect-recheck-messages is
  set.")
***************
*** 2054,2060 ****
    (gnus-define-group-parameter
     spam-process-destination
     :type list
!    :parameter-type 
     '(choice :tag "Destination for spam-processed articles at summary exit"
            (string :tag "Move to a group")
            (repeat :tag "Move to multiple groups"
--- 2054,2060 ----
    (gnus-define-group-parameter
     spam-process-destination
     :type list
!    :parameter-type
     '(choice :tag "Destination for spam-processed articles at summary exit"
            (string :tag "Move to a group")
            (repeat :tag "Move to multiple groups"
***************
*** 2072,2078 ****
  group or nil for explicit expiration.  This only makes sense for
  mail groups."
     :variable-group spam
!    :variable-type 
     '(repeat
       :tag "Spam-processed articles destination"
       (list
--- 2072,2078 ----
  group or nil for explicit expiration.  This only makes sense for
  mail groups."
     :variable-group spam
!    :variable-type
     '(repeat
       :tag "Spam-processed articles destination"
       (list
***************
*** 2085,2095 ****
         (const :tag "Expire" nil))))
     :parameter-document
     "Where spam-processed articles will go at summary exit.")
!   
    (gnus-define-group-parameter
     ham-process-destination
     :type list
!    :parameter-type 
     '(choice
       :tag "Destination for ham articles at summary exit from a spam group"
       (string :tag "Move to a group")
--- 2085,2095 ----
         (const :tag "Expire" nil))))
     :parameter-document
     "Where spam-processed articles will go at summary exit.")
! 
    (gnus-define-group-parameter
     ham-process-destination
     :type list
!    :parameter-type
     '(choice
       :tag "Destination for ham articles at summary exit from a spam group"
       (string :tag "Move to a group")
***************
*** 2109,2115 ****
  group or nil for explicit ignoring.  This only makes sense for
  mail groups, and only works in spam groups."
     :variable-group spam
!    :variable-type 
     '(repeat
       :tag "Ham articles destination"
       (list
--- 2109,2115 ----
  group or nil for explicit ignoring.  This only makes sense for
  mail groups, and only works in spam groups."
     :variable-group spam
!    :variable-type
     '(repeat
       :tag "Ham articles destination"
       (list
***************
*** 2296,2302 ****
  When set, Gnus will prefer using the locally stored content rather
  than re-fetching it from the server.  You also need to enable
  `gnus-agent' for this to have any affect."
!   :version "21.4"
    :group 'gnus-agent
    :type 'boolean)
  
--- 2296,2302 ----
  When set, Gnus will prefer using the locally stored content rather
  than re-fetching it from the server.  You also need to enable
  `gnus-agent' for this to have any affect."
!   :version "22.1"
    :group 'gnus-agent
    :type 'boolean)
  
***************
*** 2315,2321 ****
  You may customize gnus-agent to disable its use.  However, some
  back ends have started to use the agent as a client-side cache.
  Disabling the agent may result in noticeable loss of performance."
!   :version "21.4"
    :group 'gnus-agent
    :type 'boolean)
  
--- 2315,2321 ----
  You may customize gnus-agent to disable its use.  However, some
  back ends have started to use the agent as a client-side cache.
  Disabling the agent may result in noticeable loss of performance."
!   :version "22.1"
    :group 'gnus-agent
    :type 'boolean)
  
***************
*** 2347,2353 ****
  `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 "21.4"
    :group 'gnus-message
    :type '(choice
          (item :tag "Show Gnus and Emacs versions and system type"
--- 2347,2353 ----
  `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"
***************
*** 3331,3337 ****
                ;; gnus-server-method-cache so this only happens once,
                ;; if at all.
                (let (match)
!                 (mapcar 
                   (lambda (info)
                     (let ((info-method (gnus-info-method info)))
                       (unless (stringp info-method)
--- 3331,3337 ----
                ;; gnus-server-method-cache so this only happens once,
                ;; if at all.
                (let (match)
!                 (mapcar
                   (lambda (info)
                     (let ((info-method (gnus-info-method info)))
                       (unless (stringp info-method)
***************
*** 3992,4001 ****
  (defun gnus-agent-method-p (method)
    "Say whether METHOD is covered by the agent."
    (or (eq (car gnus-agent-method-p-cache) method)
!       (setq gnus-agent-method-p-cache 
              (cons method
!                   (member (if (stringp method) 
!                               method 
                              (gnus-method-to-server method)) 
gnus-agent-covered-methods))))
    (cdr gnus-agent-method-p-cache))
  
--- 3992,4001 ----
  (defun gnus-agent-method-p (method)
    "Say whether METHOD is covered by the agent."
    (or (eq (car gnus-agent-method-p-cache) method)
!       (setq gnus-agent-method-p-cache
              (cons method
!                   (member (if (stringp method)
!                               method
                              (gnus-method-to-server method)) 
gnus-agent-covered-methods))))
    (cdr gnus-agent-method-p-cache))