summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lisp/gnus/ChangeLog13
-rw-r--r--lisp/gnus/gnus-art.el10
-rw-r--r--lisp/gnus/gnus-msg.el2
-rw-r--r--lisp/gnus/gnus-sum.el10
-rw-r--r--lisp/gnus/nnir.el2
-rw-r--r--lisp/gnus/nnmail.el7
-rw-r--r--lisp/gnus/spam.el22
7 files changed, 39 insertions, 27 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index b11a7295d48..8af05ff545a 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,16 @@
+2009-08-29 Stefan Monnier <monnier@iro.umontreal.ca>
+
+ * 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 <yamaoka@jpl.org>
* mml.el (mml-attach-file, mml-attach-buffer, mml-attach-external):
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index 087ad68c539..49f49006fe7 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -727,8 +727,8 @@ Each element is a regular expression."
: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 @@ predicate. See Info node `(gnus)Customizing Articles'."
: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 @@ predicate. See Info node `(gnus)Customizing Articles'."
: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)
diff --git a/lisp/gnus/gnus-msg.el b/lisp/gnus/gnus-msg.el
index 62f23cb169d..7257099dbbe 100644
--- a/lisp/gnus/gnus-msg.el
+++ b/lisp/gnus/gnus-msg.el
@@ -149,7 +149,7 @@ See Info node `(gnus)Posting Styles'."
: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?
diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index c77e3fcd9e2..7f460ac70d6 100644
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -8284,7 +8284,7 @@ articles that are younger than AGE days."
(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 @@ If UNREPLIED (the prefix), limit to unreplied articles."
(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 @@ If NO-EXPIRE, auto-expiry will be inhibited."
(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 @@ The difference between N and the number of articles ticked is returned."
(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 @@ The difference between N and the number of articles ticked is returned."
(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.
diff --git a/lisp/gnus/nnir.el b/lisp/gnus/nnir.el
index 77fc6b6c7b7..452e67caa23 100644
--- a/lisp/gnus/nnir.el
+++ b/lisp/gnus/nnir.el
@@ -505,7 +505,7 @@ that it is for swish++, not Wais."
;; `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.
diff --git a/lisp/gnus/nnmail.el b/lisp/gnus/nnmail.el
index 47c509f68cf..df2e21efd78 100644
--- a/lisp/gnus/nnmail.el
+++ b/lisp/gnus/nnmail.el
@@ -242,9 +242,8 @@ If non-nil, also update the cache when copy or move articles."
: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 @@ Eudora has a broken References line, but an OK In-Reply-To."
(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)
diff --git a/lisp/gnus/spam.el b/lisp/gnus/spam.el
index c315f2f0347..cc10bf7a775 100644
--- a/lisp/gnus/spam.el
+++ b/lisp/gnus/spam.el
@@ -413,16 +413,16 @@ Only meaningful if you enable `spam-use-regex-body'."
"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 @@ your main source of newsgroup names."
"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 @@ When nil, use the default location."
"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 @@ When nil, use the default spamoracle database."
: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 @@ identification"
: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")