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

[Kim F . Storm]

Index: emacs/lisp/gnus/nnmail.el
diff -c emacs/lisp/gnus/nnmail.el:1.24 emacs/lisp/gnus/nnmail.el:1.25
*** emacs/lisp/gnus/nnmail.el:1.24      Tue Dec  7 21:56:39 2004
--- emacs/lisp/gnus/nnmail.el   Wed Feb  9 15:50:37 2005
***************
*** 119,125 ****
  (defcustom nnmail-split-fancy-with-parent-ignore-groups nil
    "Regexp that matches group names to be ignored when applying 
`nnmail-split-fancy-with-parent'.
  This can also be a list of regexps."
!   :version "21.4"
    :group 'nnmail-split
    :type '(choice (const :tag "none" nil)
                 (regexp :value ".*")
--- 119,125 ----
  (defcustom nnmail-split-fancy-with-parent-ignore-groups nil
    "Regexp that matches group names to be ignored when applying 
`nnmail-split-fancy-with-parent'.
  This can also be a list of regexps."
!   :version "22.1"
    :group 'nnmail-split
    :type '(choice (const :tag "none" nil)
                 (regexp :value ".*")
***************
*** 128,134 ****
  (defcustom nnmail-cache-ignore-groups nil
    "Regexp that matches group names to be ignored when inserting message ids 
into the cache (`nnmail-cache-insert').
  This can also be a list of regexps."
!   :version "21.4"
    :group 'nnmail-split
    :type '(choice (const :tag "none" nil)
                 (regexp :value ".*")
--- 128,134 ----
  (defcustom nnmail-cache-ignore-groups nil
    "Regexp that matches group names to be ignored when inserting message ids 
into the cache (`nnmail-cache-insert').
  This can also be a list of regexps."
!   :version "22.1"
    :group 'nnmail-split
    :type '(choice (const :tag "none" nil)
                 (regexp :value ".*")
***************
*** 226,232 ****
  articles containing the sting \"IMPORTANT\" in the Subject header will
  be expired to the group \"nnfolder:IMPORTANT.YYYY.MMM\"; and
  everything else will be expired to \"nnfolder:Archive-YYYY\"."
!   :version "21.4"
    :group 'nnmail-expire
    :type '(repeat (list (choice :tag "Match against"
                               (string :tag "Header")
--- 226,232 ----
  articles containing the sting \"IMPORTANT\" in the Subject header will
  be expired to the group \"nnfolder:IMPORTANT.YYYY.MMM\"; and
  everything else will be expired to \"nnfolder:Archive-YYYY\"."
!   :version "22.1"
    :group 'nnmail-expire
    :type '(repeat (list (choice :tag "Match against"
                               (string :tag "Header")
***************
*** 355,361 ****
  
  (defcustom nnmail-spool-hook nil
    "*A hook called when a new article is spooled."
!   :version "21.4"
    :group 'nnmail
    :type 'hook)
  
--- 355,361 ----
  
  (defcustom nnmail-spool-hook nil
    "*A hook called when a new article is spooled."
!   :version "22.1"
    :group 'nnmail
    :type 'hook)
  
***************
*** 370,383 ****
  (define-widget 'nnmail-lazy 'default
    "Base widget for recursive datastructures.
  
! This is copy of the `lazy' widget in Emacs 21.4 provided for compatibility."
    :format "%{%t%}: %v"
    :convert-widget 'widget-value-convert-widget
    :value-create (lambda (widget)
                    (let ((value (widget-get widget :value))
                          (type (widget-get widget :type)))
!                     (widget-put widget :children 
!                                 (list (widget-create-child-value 
                                         widget (widget-convert type) value)))))
    :value-delete 'widget-children-value-delete
    :value-get (lambda (widget)
--- 370,383 ----
  (define-widget 'nnmail-lazy 'default
    "Base widget for recursive datastructures.
  
! This is copy of the `lazy' widget in Emacs 22.1 provided for compatibility."
    :format "%{%t%}: %v"
    :convert-widget 'widget-value-convert-widget
    :value-create (lambda (widget)
                    (let ((value (widget-get widget :value))
                          (type (widget-get widget :type)))
!                     (widget-put widget :children
!                                 (list (widget-create-child-value
                                         widget (widget-convert type) value)))))
    :value-delete 'widget-children-value-delete
    :value-get (lambda (widget)
***************
*** 409,415 ****
                        (list :tag "Function with fixed arguments (:)"
                              :value (: nil)
                              (const :format "" :value :)
!                             function 
                              (editable-list :inline t (sexp :tag "Arg"))
                              )
                        (list :tag "Function with split arguments (!)"
--- 409,415 ----
                        (list :tag "Function with fixed arguments (:)"
                              :value (: nil)
                              (const :format "" :value :)
!                             function
                              (editable-list :inline t (sexp :tag "Arg"))
                              )
                        (list :tag "Function with split arguments (!)"
***************
*** 417,427 ****
                              (const :format "" !)
                              function
                              (editable-list :inline t nnmail-split-fancy))
!                       (list :tag "Field match" 
!                             (choice :tag "Field" 
                                      regexp symbol)
                              (choice :tag "Match"
!                                     regexp 
                                      (symbol :value mail))
                              (repeat :inline t
                                      :tag "Restrictions"
--- 417,427 ----
                              (const :format "" !)
                              function
                              (editable-list :inline t nnmail-split-fancy))
!                       (list :tag "Field match"
!                             (choice :tag "Field"
                                      regexp symbol)
                              (choice :tag "Match"
!                                     regexp
                                      (symbol :value mail))
                              (repeat :inline t
                                      :tag "Restrictions"
***************
*** 562,574 ****
  
  (defcustom nnmail-mail-splitting-charset nil
    "Default charset to be used when splitting incoming mail."
!   :version "21.4"
    :group 'nnmail
    :type 'symbol)
  
  (defcustom nnmail-mail-splitting-decodes nil
    "Whether the nnmail splitting functionality should MIME decode headers."
!   :version "21.4"
    :group 'nnmail
    :type 'boolean)
  
--- 562,574 ----
  
  (defcustom nnmail-mail-splitting-charset nil
    "Default charset to be used when splitting incoming mail."
!   :version "22.1"
    :group 'nnmail
    :type 'symbol)
  
  (defcustom nnmail-mail-splitting-decodes nil
    "Whether the nnmail splitting functionality should MIME decode headers."
!   :version "22.1"
    :group 'nnmail
    :type 'boolean)
  
***************
*** 578,584 ****
  by \"\\=\\<...\\>\".  If this variable is true, they are not implicitly\
   surrounded
  by anything."
!   :version "21.4"
    :group 'nnmail
    :type 'boolean)
  
--- 578,584 ----
  by \"\\=\\<...\\>\".  If this variable is true, they are not implicitly\
   surrounded
  by anything."
!   :version "22.1"
    :group 'nnmail
    :type 'boolean)
  
***************
*** 586,592 ****
    "Whether to lowercase expanded entries (i.e. \\N) when splitting mails.
  This avoids the creation of multiple groups when users send to an address
  using different case (i.e. address@hidden vs address@hidden)."
!   :version "21.4"
    :group 'nnmail
    :type 'boolean)
  
--- 586,592 ----
    "Whether to lowercase expanded entries (i.e. \\N) when splitting mails.
  This avoids the creation of multiple groups when users send to an address
  using different case (i.e. address@hidden vs address@hidden)."
!   :version "22.1"
    :group 'nnmail
    :type 'boolean)
  
***************
*** 1580,1586 ****
    (when (stringp id)
      ;; this will handle cases like `B r' where the group is nil
      (let ((grp (or grp gnus-newsgroup-name "UNKNOWN")))
!       (run-hook-with-args 'nnmail-spool-hook 
                          id grp subject sender))
      (when nnmail-treat-duplicates
        ;; Store some information about the group this message is written
--- 1580,1586 ----
    (when (stringp id)
      ;; this will handle cases like `B r' where the group is nil
      (let ((grp (or grp gnus-newsgroup-name "UNKNOWN")))
!       (run-hook-with-args 'nnmail-spool-hook
                          id grp subject sender))
      (when nnmail-treat-duplicates
        ;; Store some information about the group this message is written
***************
*** 1603,1609 ****
              (unless (and regexp (string-match regexp grp))
                (insert id "\t" grp "\n")))
          (insert id "\n"))))))
!   
  (defun nnmail-cache-primary-mail-backend ()
    (let ((be-list (cons gnus-select-method gnus-secondary-select-methods))
        (be nil)
--- 1603,1609 ----
              (unless (and regexp (string-match regexp grp))
                (insert id "\t" grp "\n")))
          (insert id "\n"))))))
! 
  (defun nnmail-cache-primary-mail-backend ()
    (let ((be-list (cons gnus-select-method gnus-secondary-select-methods))
        (be nil)