master 9853355 2/2: Remove some items obsolete since Emacs 22/23 from Gnus

[Stefan Kangas]

branch: master
commit 98533555de42f2bded824130466cf0aefc648292
Author: Stefan Kangas <stefan@marxist.se>
Commit: Stefan Kangas <stefan@marxist.se>

    Remove some items obsolete since Emacs 22/23 from Gnus
    
    * lisp/gnus/gnus-art.el (gnus-article-hide-pgp-hook)
    (gnus-treat-strip-pgp, gnus-treat-display-xface):
    * lisp/gnus/gnus-msg.el (gnus-inews-mark-gcc-as-read):
    * lisp/gnus/gnus-start.el (nnmail-spool-file):
    * lisp/gnus/nnmail.el (nnmail-spool-file)
    (nnmail-fix-eudora-headers): Remove items obsolete since 22.1.
    * lisp/gnus/gnus-art.el (gnus-treat-display-x-face):
    * lisp/gnus/gnus-msg.el (gnus-inews-do-gcc): Don't use above obsolete 
symbols.
    * doc/misc/gnus.texi (Washing Mail, Not Reading Mail): Don't refer to
    above obsolete variables.
    ; * etc/NEWS: List removed items.
    
    * lisp/gnus/gnus.el (gnus-local-domain, gnus-carpal):
    * lisp/gnus/nnimap.el (nnimap-split-rule):
    * lisp/gnus/nntp.el (nntp-authinfo-file): Fix obsolete variable
    version format.
---
 doc/misc/gnus.texi      |  6 ++----
 etc/NEWS                | 18 ++++++++++++------
 lisp/gnus/gnus-art.el   | 21 +--------------------
 lisp/gnus/gnus-msg.el   |  7 +------
 lisp/gnus/gnus-start.el |  1 -
 lisp/gnus/gnus.el       |  4 ++--
 lisp/gnus/nnimap.el     |  2 +-
 lisp/gnus/nnmail.el     |  8 --------
 lisp/gnus/nntp.el       |  2 +-
 9 files changed, 20 insertions(+), 49 deletions(-)

diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index fef066d..faf5366 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -16269,7 +16269,6 @@ Translate all @samp{@key{TAB}} characters into 
@samp{@key{SPC}} characters.
 
 @item nnmail-ignore-broken-references
 @findex nnmail-ignore-broken-references
-@c @findex nnmail-fix-eudora-headers
 @cindex Eudora
 @cindex Pegasus
 Some mail user agents (e.g., Eudora and Pegasus) produce broken
@@ -16359,9 +16358,8 @@ If you start using any of the mail back ends, they have 
the annoying
 habit of assuming that you want to read mail with them.  This might not
 be unreasonable, but it might not be what you want.
 
-If you set @code{mail-sources} and @code{nnmail-spool-file} to
-@code{nil}, none of the back ends will ever attempt to read incoming
-mail, which should help.
+If you set @code{mail-sources} to @code{nil}, none of the back ends
+will ever attempt to read incoming mail, which should help.
 
 @vindex nnbabyl-get-new-mail
 @vindex nnmbox-get-new-mail
diff --git a/etc/NEWS b/etc/NEWS
index d2b84d7..d367713 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -2347,12 +2347,12 @@ ledit.el, lmenu.el, lucid.el and old-whitespace.el.
 'minibuffer-local-must-match-filename-map', 'mouse-choose-completion',
 'mouse-major-mode-menu', 'mouse-popup-menubar',
 'mouse-popup-menubar-stuff', 'newsticker-groups-filename',
-'non-iso-charset-alist', 'nonascii-insert-offset',
-'nonascii-translation-table', 'password-read-and-add',
-'pre-abbrev-expand-hook', 'princ-list', 'print-help-return-message',
-'process-filter-multibyte-p', 'read-file-name-predicate',
-'remember-buffer', 'rmail-highlight-face', 'rmail-message-filter',
-'semantic-after-idle-scheduler-reparse-hooks',
+'nnmail-fix-eudora-headers', 'non-iso-charset-alist',
+'nonascii-insert-offset', 'nonascii-translation-table',
+'password-read-and-add', 'pre-abbrev-expand-hook', 'princ-list',
+'print-help-return-message', 'process-filter-multibyte-p',
+'read-file-name-predicate', 'remember-buffer', 'rmail-highlight-face',
+'rmail-message-filter', 'semantic-after-idle-scheduler-reparse-hooks',
 'semantic-after-toplevel-bovinate-hook',
 'semantic-before-idle-scheduler-reparse-hooks',
 'semantic-before-toplevel-bovination-hook',
@@ -2387,6 +2387,12 @@ ledit.el, lmenu.el, lucid.el and old-whitespace.el.
 'vcursor-toggle-vcursor-map', 'w32-focus-frame', 'w32-select-font',
 'wisent-lex-make-token-table'.
 
+---
+** Some functions and variables obsolete since Emacs 22 have been removed:
+'gnus-article-hide-pgp-hook', 'gnus-inews-mark-gcc-as-read',
+'gnus-treat-display-xface', 'gnus-treat-strip-pgp',
+'nnmail-spool-file'.
+
 ** The WHEN argument of 'make-obsolete' and related functions is mandatory.
 The use of those functions without a WHEN argument was marked obsolete
 back in Emacs 23.1.  The affected functions are: 'make-obsolete',
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index 435ccab..ad32308 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -728,9 +728,6 @@ Each element is a regular expression."
   :type '(repeat regexp)
   :group 'gnus-article-various)
 
-(make-obsolete-variable 'gnus-article-hide-pgp-hook nil
-                       "Gnus 5.10 (Emacs 22.1)")
-
 (defface gnus-button
   '((t (:weight bold)))
   "Face used for highlighting a button in the article buffer."
@@ -1264,9 +1261,6 @@ Any symbol is used to look up a regular expression to 
match the
 banner in `gnus-list-identifiers'.  A string is used as a regular
 expression to match the identifier directly.")
 
-(make-obsolete-variable 'gnus-treat-strip-pgp nil
-                       "Gnus 5.10 (Emacs 22.1)")
-
 (defcustom gnus-treat-strip-pem nil
   "Strip PEM signatures.
 Valid values are nil, t, `head', `first', `last', an integer or a
@@ -1396,9 +1390,6 @@ predicate.  See Info node `(gnus)Customizing Articles'."
   :link '(custom-manual "(gnus)Customizing Articles")
   :type gnus-article-treat-custom)
 
-(make-obsolete-variable 'gnus-treat-display-xface
-                       'gnus-treat-display-x-face "Emacs 22.1")
-
 (defcustom gnus-treat-display-x-face
   (and (not noninteractive)
        (gnus-image-type-available-p 'xbm)
@@ -1423,17 +1414,7 @@ See Info node `(gnus)Customizing Articles' and Info node
          symbol
          (cond ((or (boundp symbol) (get symbol 'saved-value))
                 value)
-               ((boundp 'gnus-treat-display-xface)
-                (message "\
-** gnus-treat-display-xface is an obsolete variable;\
- use gnus-treat-display-x-face instead")
-                (default-value 'gnus-treat-display-xface))
-               ((get 'gnus-treat-display-xface 'saved-value)
-                (message "\
-** gnus-treat-display-xface is an obsolete variable;\
- use gnus-treat-display-x-face instead")
-                (eval (car (get 'gnus-treat-display-xface 'saved-value)) t))
-               (t
+                (t
                 value)))))
 (put 'gnus-treat-display-x-face 'highlight t)
 
diff --git a/lisp/gnus/gnus-msg.el b/lisp/gnus/gnus-msg.el
index d7851f2..f1181d4 100644
--- a/lisp/gnus/gnus-msg.el
+++ b/lisp/gnus/gnus-msg.el
@@ -143,9 +143,6 @@ See Info node `(gnus)Posting Styles'."
   :group 'gnus-message
   :type 'boolean)
 
-(make-obsolete-variable 'gnus-inews-mark-gcc-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?
 If it is `all', attach files as external parts;
@@ -1659,9 +1656,7 @@ this is a reply."
                         ;; FIXME: Should gcc-mark-as-read work when
                         ;; Gnus is not running?
                         (gnus-alive-p))
-               (if (or gnus-gcc-mark-as-read
-                       (and (boundp 'gnus-inews-mark-gcc-as-read)
-                            (symbol-value 'gnus-inews-mark-gcc-as-read)))
+                (if gnus-gcc-mark-as-read
                    (gnus-group-mark-article-read group (cdr group-art))
                  (with-current-buffer gnus-group-buffer
                    (let ((gnus-group-marked (list group))
diff --git a/lisp/gnus/gnus-start.el b/lisp/gnus/gnus-start.el
index a3112bd..a6b362e 100644
--- a/lisp/gnus/gnus-start.el
+++ b/lisp/gnus/gnus-start.el
@@ -663,7 +663,6 @@ the first newsgroup."
 (defvar mail-sources)
 (defvar nnmail-scan-directory-mail-source-once)
 (defvar nnmail-split-history)
-(defvar nnmail-spool-file)
 
 (defun gnus-close-all-servers ()
   "Close all servers."
diff --git a/lisp/gnus/gnus.el b/lisp/gnus/gnus.el
index 0334b81..2f2b206 100644
--- a/lisp/gnus/gnus.el
+++ b/lisp/gnus/gnus.el
@@ -1138,7 +1138,7 @@ no need to set this variable."
   :group 'gnus-message
   :type '(choice (const :tag "default" nil)
                 string))
-(make-obsolete-variable 'gnus-local-domain nil "Emacs 24.1")
+(make-obsolete-variable 'gnus-local-domain nil "24.1")
 
 ;; Customization variables
 
@@ -2310,7 +2310,7 @@ automatically cache the article in the agent cache."
 ;; The carpal mode has been removed, but define the variable for
 ;; backwards compatibility.
 (defvar gnus-carpal nil)
-(make-obsolete-variable 'gnus-carpal nil "Emacs 24.1")
+(make-obsolete-variable 'gnus-carpal nil "24.1")
 
 (defvar gnus-agent-fetching nil
   "Whether Gnus agent is in fetching mode.")
diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el
index f4f4ef8..93e1c47 100644
--- a/lisp/gnus/nnimap.el
+++ b/lisp/gnus/nnimap.el
@@ -95,7 +95,7 @@ Uses the same syntax as `nnmail-split-methods'.")
   "Articles with the flags in the list will not be considered when splitting.")
 
 (make-obsolete-variable 'nnimap-split-rule "see `nnimap-split-methods'."
-                       "Emacs 24.1")
+                        "24.1")
 
 (defvoo nnimap-authenticator nil
   "How nnimap authenticate itself to the server.
diff --git a/lisp/gnus/nnmail.el b/lisp/gnus/nnmail.el
index 9826bc6..bcf01cf 100644
--- a/lisp/gnus/nnmail.el
+++ b/lisp/gnus/nnmail.el
@@ -240,11 +240,6 @@ If non-nil, also update the cache when copy or move 
articles."
   :group 'nnmail
   :type 'boolean)
 
-(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
-
 (defcustom nnmail-resplit-incoming nil
   "If non-nil, re-split incoming procmail sorted mail."
   :group 'nnmail-procmail
@@ -1321,9 +1316,6 @@ Eudora has a broken References line, but an OK 
In-Reply-To."
     (when (re-search-forward "^\\(In-Reply-To:[^\n]+\\)\n[ \t]+" nil t)
       (replace-match "\\1" t))))
 
-(defalias '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/nntp.el b/lisp/gnus/nntp.el
index 1eb604d..1fd2ed0 100644
--- a/lisp/gnus/nntp.el
+++ b/lisp/gnus/nntp.el
@@ -233,7 +233,7 @@ server there that you can connect to.  See also
                                          (const :format "" "password")
                                          (string :format "Password: %v")))))))
 
-(make-obsolete 'nntp-authinfo-file nil "Emacs 24.1")
+(make-obsolete 'nntp-authinfo-file nil "24.1")