[Emacs-diffs] /srv/bzr/emacs/trunk r101608: Merge changes made in Gnus trunk.

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 101608
author: Julien Danjou <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Sat 2010-09-25 13:28:07 +0000
message:
  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.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/gnus-bookmark.el
  lisp/gnus/gnus-group.el
  lisp/gnus/gnus-picon.el
  lisp/gnus/gnus-sum.el
  lisp/gnus/gnus-uu.el
  lisp/gnus/gnus.el
  lisp/gnus/mml1991.el
  lisp/gnus/mml2015.el
  lisp/gnus/nnheader.el
  lisp/gnus/rfc1843.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2010-09-25 12:49:02 +0000
+++ b/lisp/gnus/ChangeLog       2010-09-25 13:28:07 +0000
@@ -1,5 +1,30 @@
 2010-09-25  Julien Danjou  <address@hidden>
 
+       * 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.

=== modified file 'lisp/gnus/gnus-bookmark.el'
--- a/lisp/gnus/gnus-bookmark.el        2010-09-02 00:55:51 +0000
+++ b/lisp/gnus/gnus-bookmark.el        2010-09-25 13:28:07 +0000
@@ -156,9 +156,6 @@
   "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

=== modified file 'lisp/gnus/gnus-group.el'
--- a/lisp/gnus/gnus-group.el   2010-09-24 22:33:34 +0000
+++ b/lisp/gnus/gnus-group.el   2010-09-25 13:28:07 +0000
@@ -548,8 +548,6 @@
 (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 @@
           (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.

=== modified file 'lisp/gnus/gnus-picon.el'
--- a/lisp/gnus/gnus-picon.el   2010-09-02 00:55:51 +0000
+++ b/lisp/gnus/gnus-picon.el   2010-09-25 13:28:07 +0000
@@ -101,7 +101,6 @@
 
 ;;; 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.")

=== modified file 'lisp/gnus/gnus-sum.el'
--- a/lisp/gnus/gnus-sum.el     2010-09-24 22:33:34 +0000
+++ b/lisp/gnus/gnus-sum.el     2010-09-25 13:28:07 +0000
@@ -6216,8 +6216,6 @@
        (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

=== modified file 'lisp/gnus/gnus-uu.el'
--- a/lisp/gnus/gnus-uu.el      2010-09-18 10:02:19 +0000
+++ b/lisp/gnus/gnus-uu.el      2010-09-25 13:28:07 +0000
@@ -335,7 +335,6 @@
 
 (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\\)")
 

=== modified file 'lisp/gnus/gnus.el'
--- a/lisp/gnus/gnus.el 2010-09-25 12:49:02 +0000
+++ b/lisp/gnus/gnus.el 2010-09-25 13:28:07 +0000
@@ -2621,9 +2621,6 @@
 (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 @@
       ,(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)

=== modified file 'lisp/gnus/mml1991.el'
--- a/lisp/gnus/mml1991.el      2010-09-02 00:55:51 +0000
+++ b/lisp/gnus/mml1991.el      2010-09-25 13:28:07 +0000
@@ -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.")
 

=== modified file 'lisp/gnus/mml2015.el'
--- a/lisp/gnus/mml2015.el      2010-09-25 12:49:02 +0000
+++ b/lisp/gnus/mml2015.el      2010-09-25 13:28:07 +0000
@@ -188,9 +188,6 @@
 (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)
 

=== modified file 'lisp/gnus/nnheader.el'
--- a/lisp/gnus/nnheader.el     2010-09-20 00:36:54 +0000
+++ b/lisp/gnus/nnheader.el     2010-09-25 13:28:07 +0000
@@ -570,8 +570,6 @@
 
 (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)
 

=== modified file 'lisp/gnus/rfc1843.el'
--- a/lisp/gnus/rfc1843.el      2010-09-02 00:55:51 +0000
+++ b/lisp/gnus/rfc1843.el      2010-09-25 13:28:07 +0000
@@ -166,7 +166,6 @@
                      (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)