[Emacs-diffs] emacs/lisp/gnus spam.el nnmail.el nnir.el gnus-...

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        09/08/29 03:03:24

Modified files:
        lisp/gnus      : spam.el nnmail.el nnir.el gnus-sum.el 
                         gnus-msg.el gnus-art.el ChangeLog 

Log message:
        * spam.el (spam-ifile-path, spam-bogofilter-path, spam-sa-learn-path)
        (spam-ifile-database-path, spam-bsfilter-path, spam-spamassassin-path):
        * nnmail.el (nnmail-spool-file, nnmail-fix-eudora-headers):
        * nnir.el (nnir-swish-e-index-file):
        * gnus-sum.el (gnus-summary-delete-marked-as-read)
        (gnus-summary-delete-marked-with, gnus-summary-mark-as-unread-forward)
        (gnus-summary-mark-as-unread-backward, gnus-summary-mark-as-unread):
        * gnus-msg.el (gnus-inews-mark-gcc-as-read):
        * gnus-art.el (gnus-article-hide-pgp-hook, gnus-treat-strip-pgp)
        (gnus-treat-display-xface): Add Emacs version of obsolescence.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/gnus/spam.el?cvsroot=emacs&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/gnus/nnmail.el?cvsroot=emacs&r1=1.52&r2=1.53
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/gnus/nnir.el?cvsroot=emacs&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/gnus/gnus-sum.el?cvsroot=emacs&r1=1.141&r2=1.142
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/gnus/gnus-msg.el?cvsroot=emacs&r1=1.57&r2=1.58
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/gnus/gnus-art.el?cvsroot=emacs&r1=1.182&r2=1.183
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/gnus/ChangeLog?cvsroot=emacs&r1=1.819&r2=1.820

Patches:
Index: spam.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/gnus/spam.el,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- spam.el     28 Apr 2009 16:57:53 -0000      1.29
+++ spam.el     29 Aug 2009 03:03:23 -0000      1.30
@@ -413,16 +413,16 @@
   "Spam ifile configuration."
   :group 'spam)
 
-(make-obsolete-variable 'spam-ifile-path 'spam-ifile-program)
-;; "22.1" ;; Gnus 5.10.9
+(make-obsolete-variable 'spam-ifile-path 'spam-ifile-program
+                        "Gnus 5.10.9 (Emacs 22.1)")
 (defcustom spam-ifile-program (executable-find "ifile")
   "Name of the ifile program."
   :type '(choice (file :tag "Location of ifile")
                 (const :tag "ifile is not installed"))
   :group 'spam-ifile)
 
-(make-obsolete-variable 'spam-ifile-database-path 'spam-ifile-database)
-;; "22.1" ;; Gnus 5.10.9
+(make-obsolete-variable 'spam-ifile-database-path 'spam-ifile-database
+                        "Gnus 5.10.9 (Emacs 22.1)")
 (defcustom spam-ifile-database nil
   "File name of the ifile database."
   :type '(choice (file :tag "Location of the ifile database")
@@ -452,8 +452,8 @@
   "Spam bogofilter configuration."
   :group 'spam)
 
-(make-obsolete-variable 'spam-bogofilter-path 'spam-bogofilter-program)
-;; "22.1" ;; Gnus 5.10.9
+(make-obsolete-variable 'spam-bogofilter-path 'spam-bogofilter-program
+                        "Gnus 5.10.9 (Emacs 22.1)")
 (defcustom spam-bogofilter-program (executable-find "bogofilter")
   "Name of the Bogofilter program."
   :type '(choice (file :tag "Location of bogofilter")
@@ -504,8 +504,8 @@
   "Spam bsfilter configuration."
   :group 'spam)
 
-(make-obsolete-variable 'spam-bsfilter-path 'spam-bsfilter-program)
-;; "22.1" ;; Gnus 5.10.9
+(make-obsolete-variable 'spam-bsfilter-path 'spam-bsfilter-program
+                        "Gnus 5.10.9 (Emacs 22.1)")
 (defcustom spam-bsfilter-program (executable-find "bsfilter")
   "Name of the Bsfilter program."
   :type '(choice (file :tag "Location of bsfilter")
@@ -571,7 +571,7 @@
   :group 'spam)
 
 (make-obsolete-variable 'spam-spamassassin-path
-  'spam-spamassassin-program) ;; "22.1" ;; Gnus 5.10.9
+  'spam-spamassassin-program "Gnus 5.10.9 (Emacs 22.1)")
 (defcustom spam-assassin-program (executable-find "spamassassin")
   "Name of the spamassassin program.
 Hint: set this to \"spamc\" if you have spamd running.  See the spamc and
@@ -602,8 +602,8 @@
   :type 'string
   :group 'spam-spamassassin)
 
-(make-obsolete-variable 'spam-sa-learn-path 'spam-sa-learn-program)
-;; "22.1" ;; Gnus 5.10.9
+(make-obsolete-variable 'spam-sa-learn-path 'spam-sa-learn-program
+                        "Gnus 5.10.9 (Emacs 22.1)")
 (defcustom spam-sa-learn-program (executable-find "sa-learn")
   "Name of the sa-learn program."
   :type '(choice (file :tag "Location of spamassassin")

Index: nnmail.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/gnus/nnmail.el,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -b -r1.52 -r1.53
--- nnmail.el   19 Jan 2009 01:06:28 -0000      1.52
+++ nnmail.el   29 Aug 2009 03:03:23 -0000      1.53
@@ -242,9 +242,8 @@
   :group 'nnmail
   :type 'boolean)
 
-(make-obsolete-variable 'nnmail-spool-file
-                       "This option is obsolete in Gnus 5.9.  \
-Use `mail-sources' instead.")
+(make-obsolete-variable 'nnmail-spool-file 'mail-sources
+                       "Gnus 5.9 (Emacs 22.1)")
 ;; revision 5.29 / p0-85 / Gnus 5.9
 ;; Variable removed in No Gnus v0.7
 
@@ -1318,7 +1317,7 @@
       (replace-match "\\1" t))))
 
 (defalias 'nnmail-fix-eudora-headers 'nnmail-ignore-broken-references)
-(make-obsolete 'nnmail-fix-eudora-headers 'nnmail-ignore-broken-references)
+(make-obsolete 'nnmail-fix-eudora-headers 'nnmail-ignore-broken-references 
"Emacs 23.1")
 
 (custom-add-option 'nnmail-prepare-incoming-header-hook
                   'nnmail-ignore-broken-references)

Index: nnir.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/gnus/nnir.el,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- nnir.el     25 Aug 2009 07:03:50 -0000      1.5
+++ nnir.el     29 Aug 2009 03:03:23 -0000      1.6
@@ -505,7 +505,7 @@
 ;; `nnir-swish-e-additional-switches'
 
 (make-obsolete-variable 'nnir-swish-e-index-file
-                       'nnir-swish-e-index-files)
+                       'nnir-swish-e-index-files "Emacs 23.1")
 (defcustom nnir-swish-e-index-file
   (expand-file-name "~/Mail/index.swish-e")
   "*Index file for swish-e.

Index: gnus-sum.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/gnus/gnus-sum.el,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -b -r1.141 -r1.142
--- gnus-sum.el 29 Aug 2009 00:27:14 -0000      1.141
+++ gnus-sum.el 29 Aug 2009 03:03:23 -0000      1.142
@@ -8284,7 +8284,7 @@
 
 (defalias 'gnus-summary-delete-marked-as-read 'gnus-summary-limit-to-unread)
 (make-obsolete
- 'gnus-summary-delete-marked-as-read 'gnus-summary-limit-to-unread)
+ 'gnus-summary-delete-marked-as-read 'gnus-summary-limit-to-unread "Emacs 
20.4")
 
 (defun gnus-summary-limit-to-unread (&optional all)
   "Limit the summary buffer to articles that are not marked as read.
@@ -8379,7 +8379,7 @@
 
 (defalias 'gnus-summary-delete-marked-with 'gnus-summary-limit-exclude-marks)
 (make-obsolete 'gnus-summary-delete-marked-with
-              'gnus-summary-limit-exclude-marks)
+              'gnus-summary-limit-exclude-marks "Emacs 20.4")
 
 (defun gnus-summary-limit-exclude-marks (marks &optional reverse)
   "Exclude articles that are marked with MARKS (e.g. \"DK\").
@@ -10821,7 +10821,7 @@
 (defalias 'gnus-summary-mark-as-unread-forward
   'gnus-summary-tick-article-forward)
 (make-obsolete 'gnus-summary-mark-as-unread-forward
-              'gnus-summary-tick-article-forward)
+              'gnus-summary-tick-article-forward "Emacs 20.4")
 (defun gnus-summary-tick-article-forward (n)
   "Tick N articles forwards.
 If N is negative, tick backwards instead.
@@ -10832,7 +10832,7 @@
 (defalias 'gnus-summary-mark-as-unread-backward
   'gnus-summary-tick-article-backward)
 (make-obsolete 'gnus-summary-mark-as-unread-backward
-              'gnus-summary-tick-article-backward)
+              'gnus-summary-tick-article-backward "Emacs 20.4")
 (defun gnus-summary-tick-article-backward (n)
   "Tick N articles backwards.
 The difference between N and the number of articles ticked is returned."
@@ -10840,7 +10840,7 @@
   (gnus-summary-mark-forward (- n) gnus-ticked-mark))
 
 (defalias 'gnus-summary-mark-as-unread 'gnus-summary-tick-article)
-(make-obsolete 'gnus-summary-mark-as-unread 'gnus-summary-tick-article)
+(make-obsolete 'gnus-summary-mark-as-unread 'gnus-summary-tick-article "Emacs 
20.4")
 (defun gnus-summary-tick-article (&optional article clear-mark)
   "Mark current article as unread.
 Optional 1st argument ARTICLE specifies article number to be marked as unread.

Index: gnus-msg.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/gnus/gnus-msg.el,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -b -r1.57 -r1.58
--- gnus-msg.el 9 Jan 2009 03:01:51 -0000       1.57
+++ gnus-msg.el 29 Aug 2009 03:03:24 -0000      1.58
@@ -149,7 +149,7 @@
   :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?

Index: gnus-art.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/gnus/gnus-art.el,v
retrieving revision 1.182
retrieving revision 1.183
diff -u -b -r1.182 -r1.183
--- gnus-art.el 29 Aug 2009 00:27:15 -0000      1.182
+++ gnus-art.el 29 Aug 2009 03:03:24 -0000      1.183
@@ -727,8 +727,8 @@
   :type '(repeat regexp)
   :group 'gnus-article-various)
 
-(make-obsolete-variable 'gnus-article-hide-pgp-hook
-                       "This variable is obsolete in Gnus 5.10.")
+(make-obsolete-variable 'gnus-article-hide-pgp-hook nil
+                       "Gnus 5.10 (Emacs-22.1)")
 
 (defface gnus-button
   '((t (:weight bold)))
@@ -1217,8 +1217,8 @@
   :link '(custom-manual "(gnus)Customizing Articles")
   :type gnus-article-treat-custom)
 
-(make-obsolete-variable 'gnus-treat-strip-pgp
-                       "This option is obsolete in Gnus 5.10.")
+(make-obsolete-variable 'gnus-treat-strip-pgp nil
+                       "Gnus 5.10 (Emacs 22.1)")
 
 (defcustom gnus-treat-strip-pem nil
   "Strip PEM signatures.
@@ -1409,7 +1409,7 @@
   :type gnus-article-treat-custom)
 
 (make-obsolete-variable 'gnus-treat-display-xface
-                       'gnus-treat-display-x-face)
+                       'gnus-treat-display-x-face "22.1")
 
 (defcustom gnus-treat-display-x-face
   (and (not noninteractive)

Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/gnus/ChangeLog,v
retrieving revision 1.819
retrieving revision 1.820
diff -u -b -r1.819 -r1.820
--- ChangeLog   29 Aug 2009 00:27:13 -0000      1.819
+++ ChangeLog   29 Aug 2009 03:03:24 -0000      1.820
@@ -1,3 +1,16 @@
+2009-08-29  Stefan Monnier  <address@hidden>
+
+       * spam.el (spam-ifile-path, spam-bogofilter-path, spam-sa-learn-path)
+       (spam-ifile-database-path, spam-bsfilter-path, spam-spamassassin-path):
+       * nnmail.el (nnmail-spool-file, nnmail-fix-eudora-headers):
+       * nnir.el (nnir-swish-e-index-file):
+       * gnus-sum.el (gnus-summary-delete-marked-as-read)
+       (gnus-summary-delete-marked-with, gnus-summary-mark-as-unread-forward)
+       (gnus-summary-mark-as-unread-backward, gnus-summary-mark-as-unread):
+       * gnus-msg.el (gnus-inews-mark-gcc-as-read):
+       * gnus-art.el (gnus-article-hide-pgp-hook, gnus-treat-strip-pgp)
+       (gnus-treat-display-xface): Add Emacs version of obsolescence.
+
 2009-08-28  Katsumi Yamaoka  <address@hidden>
 
        * mml.el (mml-attach-file, mml-attach-buffer, mml-attach-external):