Merge changes made in Gnus trunk.

gnus-bookmark.el: Remove useless gnus-bookmark-after-jump-hook.
gnus-group.el: Remove useless gnus-group-icon-cache.
gnus-group.el: Remove useless gnus-ephemeral-group-server.
gnus-picon.el: Remove useless gnus-picon-setup-p.
gnus-sum.el: Remove useless gnus-newsgroup-none-id.
gnus-uu.el: Remove gnus-uu-shar-file-name.
gnus.el: Remove useless gnus-use-generic-from.
gnus.el: Remove obsolete variable gnus-topic-indentation.
mml1991.el: Remove useless mml1991-verbose.
mml2015.el: Remove mc-default-scheme and mc-schemes useless variables.
nnheader.el: Remove useless variables news-reply-yank-message-id and news-reply-yank-from.
rfc1843.el: Remove useless rfc1843-old-gnus-decode-header-function variable.

11 files changed, 25 insertions, 25 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 246fc048b0c..bbdceb51911 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,5 +1,30 @@
 2010-09-25  Julien Danjou  <julien@danjou.info>
 
+        * rfc1843.el: Remove useless rfc1843-old-gnus-decode-header-function
+        variables.
+
+        * nnheader.el: Remove useless variables news-reply-yank-from and
+        news-reply-yank-message-id.
+
+        * mml2015.el: Remove useless mc-default-scheme and mc-schemes
+        variables.
+
+        * mml1991.el: Remove useless mml1991-verbose.
+
+        * gnus.el: Remove useless variable gnus-use-generic-from.
+        Remove obsolete variable gnus-topic-indentation.
+
+        * gnus-uu.el: Remove useless gnus-uu-shar-file-name.
+
+        * gnus-sum.el: Remove useless gnus-newsgroup-none-id.
+
+        * gnus-picon.el: Remove useless gnus-picon-setup-p variable.
+
+        * gnus-group.el: Remove useless gnus-group-icon-cache.
+        Remove useless gnus-ephemeral-group-server.
+
+        * gnus-bookmark.el: Remove useless gnus-bookmark-after-jump-hook.
+
         * mml2015.el: Remove useless mml2015-verbose.
 
         * mml-smime.el: Remove useless mml-smime-verbose.
diff --git a/lisp/gnus/gnus-bookmark.el b/lisp/gnus/gnus-bookmark.el
index aa3e2d70df0..137479b4e77 100644
--- a/lisp/gnus/gnus-bookmark.el
+++ b/lisp/gnus/gnus-bookmark.el
@@ -156,9 +156,6 @@ The default value is \(author subject date group annotation\)."
   "The current version of the format used by bookmark files.
 You should never need to change this.")
 
-(defvar gnus-bookmark-after-jump-hook nil
-  "Hook run after `gnus-bookmark-jump' jumps to a Gnus bookmark.")
-
 (defvar gnus-bookmark-alist ()
   "Association list of Gnus bookmarks and their records.
 The format of the alist is
diff --git a/lisp/gnus/gnus-group.el b/lisp/gnus/gnus-group.el
index 482d8e9231e..5a25d513a57 100644
--- a/lisp/gnus/gnus-group.el
+++ b/lisp/gnus/gnus-group.el
@@ -548,8 +548,6 @@ simple manner.")
 (defvar gnus-group-list-mode nil)
 
 
-(defvar gnus-group-icon-cache nil)
-
 (defvar gnus-group-listed-groups nil)
 (defvar gnus-group-list-option nil)
 
@@ -2222,8 +2220,6 @@ Returns whether the fetching was successful or not."
            (other-frame 1))))
   (gnus-fetch-group group))
 
-(defvar gnus-ephemeral-group-server 0)
-
 (defcustom gnus-large-ephemeral-newsgroup 200
   "The number of articles which indicates a large ephemeral newsgroup.
 Same as `gnus-large-newsgroup', but only used for ephemeral newsgroups.
diff --git a/lisp/gnus/gnus-picon.el b/lisp/gnus/gnus-picon.el
index d319fd3f768..fb23d9056ed 100644
--- a/lisp/gnus/gnus-picon.el
+++ b/lisp/gnus/gnus-picon.el
@@ -101,7 +101,6 @@ added right to the textual representation."
 
 ;;; Internal variables:
 
-(defvar gnus-picon-setup-p nil)
 (defvar gnus-picon-glyph-alist nil
   "Picon glyphs cache.
 List of pairs (KEY . GLYPH) where KEY is either a filename or an URL.")
diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index f019731d8b2..0af75829bd3 100644
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -6216,8 +6216,6 @@ The resulting hash table is returned, or nil if no Xrefs were found."
         (unless (gnus-ephemeral-group-p group)
           (gnus-group-update-group group t))))))
 
-(defvar gnus-newsgroup-none-id 0)
-
 (defun gnus-get-newsgroup-headers (&optional dependencies force-new)
   (let ((cur nntp-server-buffer)
         (dependencies
diff --git a/lisp/gnus/gnus-uu.el b/lisp/gnus/gnus-uu.el
index 614a52c176c..d4f382a0c29 100644
--- a/lisp/gnus/gnus-uu.el
+++ b/lisp/gnus/gnus-uu.el
@@ -335,7 +335,6 @@ didn't work, and overwrite existing files.  Otherwise, ask each time."
 
 (defvar gnus-uu-shar-begin-string "^#! */bin/sh")
 
-(defvar gnus-uu-shar-file-name nil)
 (defvar gnus-uu-shar-name-marker
   "begin 0?[0-7][0-7][0-7][ \t]+\\(\\(\\w\\|[.\\:]\\)*\\b\\)")
 
diff --git a/lisp/gnus/gnus.el b/lisp/gnus/gnus.el
index a9ab7ed97fb..2a5533db079 100644
--- a/lisp/gnus/gnus.el
+++ b/lisp/gnus/gnus.el
@@ -2621,9 +2621,6 @@ a string, be sure to use a valid format, see RFC 2616."
 (defvar gnus-tree-buffer "*Tree*"
   "Buffer where Gnus thread trees are displayed.")
 
-;; Dummy variable.
-(defvar gnus-use-generic-from nil)
-
 ;; Variable holding the user answers to all method prompts.
 (defvar gnus-method-history nil)
 
@@ -2651,8 +2648,6 @@ a string, be sure to use a valid format, see RFC 2616."
       ,(nnheader-concat gnus-cache-directory "active"))))
   "List of predefined (convenience) servers.")
 
-(defvar gnus-topic-indentation "") ;; Obsolete variable.
-
 (defconst gnus-article-mark-lists
   '((marked . tick) (replied . reply)
     (expirable . expire) (killed . killed)
diff --git a/lisp/gnus/mml1991.el b/lisp/gnus/mml1991.el
index 8f9076cbc3f..b73162ff131 100644
--- a/lisp/gnus/mml1991.el
+++ b/lisp/gnus/mml1991.el
@@ -65,9 +65,6 @@
          mml1991-epg-encrypt))
   "Alist of PGP functions.")
 
-(defvar mml1991-verbose mml-secure-verbose
-  "If non-nil, ask the user about the current operation more verbosely.")
-
 (defvar mml1991-cache-passphrase mml-secure-cache-passphrase
   "If t, cache passphrase.")
 
diff --git a/lisp/gnus/mml2015.el b/lisp/gnus/mml2015.el
index fb581086512..1002f24ea82 100644
--- a/lisp/gnus/mml2015.el
+++ b/lisp/gnus/mml2015.el
@@ -188,9 +188,6 @@ Whether the passphrase is cached at all is controlled by
 (autoload 'mc-cleanup-recipient-headers "mc-toplev")
 (autoload 'mc-sign-generic "mc-toplev")
 
-(defvar mc-default-scheme)
-(defvar mc-schemes)
-
 (defvar mml2015-decrypt-function 'mailcrypt-decrypt)
 (defvar mml2015-verify-function 'mailcrypt-verify)
 
diff --git a/lisp/gnus/nnheader.el b/lisp/gnus/nnheader.el
index 03014e540c6..9d22080cc75 100644
--- a/lisp/gnus/nnheader.el
+++ b/lisp/gnus/nnheader.el
@@ -570,8 +570,6 @@ the line could be found."
 
 (defvar nntp-server-buffer nil)
 (defvar nntp-process-response nil)
-(defvar news-reply-yank-from nil)
-(defvar news-reply-yank-message-id nil)
 
 (defvar nnheader-callback-function nil)
 
diff --git a/lisp/gnus/rfc1843.el b/lisp/gnus/rfc1843.el
index 9826455832b..e395ee54c3c 100644
--- a/lisp/gnus/rfc1843.el
+++ b/lisp/gnus/rfc1843.el
@@ -166,7 +166,6 @@ ftp://ftp.math.psu.edu/pub/simpson/chinese/hzp/hzp.doc"
                       (equal (car ctl) "text/plain"))
               (rfc1843-decode-region (point) (point-max))))))))
 
-(defvar rfc1843-old-gnus-decode-header-function  nil)
 (defvar gnus-decode-header-methods)
 (defvar gnus-decode-encoded-word-methods)