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

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 101606
author: Julien Danjou <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Sat 2010-09-25 12:49:02 +0000
message:
  Merge changes made in Gnus.tranck
  
  gnus-art.el: Remove useless gnus-treat-translate.
  gnus-gravatar.el (gnus-gravatar-transform-address): Use       
gnus-gravatar-size.
  gnus.el: Remove useless gnus-local-domain.
  mml-smime.el: Remove useless mml-smime-verbose.
  mml2015.el: Remove useless mml2015-verbose.
modified:
  doc/misc/gnus.texi
  lisp/gnus/ChangeLog
  lisp/gnus/gnus-art.el
  lisp/gnus/gnus-gravatar.el
  lisp/gnus/gnus.el
  lisp/gnus/mml-smime.el
  lisp/gnus/mml2015.el

=== modified file 'doc/misc/gnus.texi'
--- a/doc/misc/gnus.texi        2010-09-24 22:33:34 +0000
+++ b/doc/misc/gnus.texi        2010-09-25 12:49:02 +0000
@@ -12630,7 +12630,6 @@
 @vindex gnus-treat-highlight-headers
 @vindex gnus-treat-highlight-signature
 @vindex gnus-treat-play-sounds
address@hidden gnus-treat-translate
 @vindex gnus-treat-x-pgp-sig
 @vindex gnus-treat-unfold-headers
 @vindex gnus-treat-fold-headers
@@ -12737,8 +12736,6 @@
 
 @vindex gnus-treat-play-sounds
 @item gnus-treat-play-sounds
address@hidden gnus-treat-translate
address@hidden gnus-treat-translate
 @item gnus-treat-ansi-sequences (t)
 @vindex gnus-treat-x-pgp-sig
 @item gnus-treat-x-pgp-sig (head)

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2010-09-24 22:33:34 +0000
+++ b/lisp/gnus/ChangeLog       2010-09-25 12:49:02 +0000
@@ -1,3 +1,16 @@
+2010-09-25  Julien Danjou  <address@hidden>
+
+       * mml2015.el: Remove useless mml2015-verbose.
+
+       * mml-smime.el: Remove useless mml-smime-verbose.
+
+       * gnus.el: Remove useless gnus-local-domain.
+
+       * gnus-gravatar.el (gnus-gravatar-transform-address): Use
+       gnus-gravatar-size.
+
+       * gnus-art.el: Remove useless gnus-treat-translate.
+
 2010-09-24  Julien Danjou  <address@hidden>
 
        * gnus-sum.el: Add support for Gravatars.

=== modified file 'lisp/gnus/gnus-art.el'
--- a/lisp/gnus/gnus-art.el     2010-09-24 22:33:34 +0000
+++ b/lisp/gnus/gnus-art.el     2010-09-25 12:49:02 +0000
@@ -1609,15 +1609,6 @@
   :link '(custom-manual "(gnus)Customizing Articles")
   :type gnus-article-treat-custom)
 
-(defcustom gnus-treat-translate nil
-  "Translate articles from one language to another.
-Valid values are nil, t, `head', `first', `last', an integer or a
-predicate.  See Info node `(gnus)Customizing Articles'."
-  :version "21.1"
-  :group 'gnus-article-treat
-  :link '(custom-manual "(gnus)Customizing Articles")
-  :type gnus-article-treat-custom)
-
 (defcustom gnus-treat-x-pgp-sig nil
   "Verify X-PGP-Sig.
 To automatically treat X-PGP-Sig, set it to head.

=== modified file 'lisp/gnus/gnus-gravatar.el'
--- a/lisp/gnus/gnus-gravatar.el        2010-09-24 22:33:34 +0000
+++ b/lisp/gnus/gnus-gravatar.el        2010-09-25 12:49:02 +0000
@@ -54,11 +54,12 @@
                (mail-encode-encoded-word-string
                 (or (mail-fetch-field header) "")))
              (mail-fetch-field header)))))
-      (dolist (address addresses)
-        (gravatar-retrieve
-         (car address)
-         'gnus-gravatar-insert
-         (list header (car address) category))))))
+      (let ((gravatar-size gnus-gravatar-size))
+        (dolist (address addresses)
+          (gravatar-retrieve
+           (car address)
+           'gnus-gravatar-insert
+           (list header (car address) category)))))))
 
 (defun gnus-gravatar-insert (gravatar header address category)
   "Insert GRAVATAR for ADDRESS in HEADER in current article buffer.

=== modified file 'lisp/gnus/gnus.el'
--- a/lisp/gnus/gnus.el 2010-09-24 22:33:34 +0000
+++ b/lisp/gnus/gnus.el 2010-09-25 12:49:02 +0000
@@ -1428,15 +1428,6 @@
   "Default default new newsgroups the first time Gnus is run.
 Should be set in paths.el, and shouldn't be touched by the user.")
 
-(defcustom gnus-local-domain nil
-  "Local domain name without a host name.
-The DOMAINNAME environment variable is used instead if it is defined.
-If the function `system-name' returns the full Internet name, there is
-no need to set this variable."
-  :group 'gnus-message
-  :type '(choice (const :tag "default" nil)
-                string))
-
 (defvar gnus-local-organization nil
   "String with a description of what organization (if any) the user belongs to.
 Obsolete variable; use `message-user-organization' instead.")

=== modified file 'lisp/gnus/mml-smime.el'
--- a/lisp/gnus/mml-smime.el    2010-09-02 00:55:51 +0000
+++ b/lisp/gnus/mml-smime.el    2010-09-25 12:49:02 +0000
@@ -53,11 +53,6 @@
         mml-smime-epg-verify
         mml-smime-epg-verify-test)))
 
-(defcustom mml-smime-verbose mml-secure-verbose
-  "If non-nil, ask the user about the current operation more verbosely."
-  :group 'mime-security
-  :type 'boolean)
-
 (defcustom mml-smime-cache-passphrase mml-secure-cache-passphrase
   "If t, cache passphrase."
   :group 'mime-security

=== modified file 'lisp/gnus/mml2015.el'
--- a/lisp/gnus/mml2015.el      2010-09-02 00:55:51 +0000
+++ b/lisp/gnus/mml2015.el      2010-09-25 12:49:02 +0000
@@ -119,11 +119,6 @@
   :type '(repeat (cons (regexp :tag "GnuPG output regexp")
                       (boolean :tag "Trust key"))))
 
-(defcustom mml2015-verbose mml-secure-verbose
-  "If non-nil, ask the user about the current operation more verbosely."
-  :group 'mime-security
-  :type 'boolean)
-
 (defcustom mml2015-cache-passphrase mml-secure-cache-passphrase
   "If t, cache passphrase."
   :group 'mime-security