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.

7 files changed, 19 insertions, 36 deletions

diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index 16d78027603..a22644f2f98 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -12630,7 +12630,6 @@ controlling variable is a predicate list, as described above.
 @vindex gnus-treat-highlight-headers
 @vindex gnus-treat-highlight-signature
 @vindex gnus-treat-play-sounds
-@vindex gnus-treat-translate
 @vindex gnus-treat-x-pgp-sig
 @vindex gnus-treat-unfold-headers
 @vindex gnus-treat-fold-headers
@@ -12737,8 +12736,6 @@ is controlled by @code{gnus-body-boundary-delimiter}.
 
 @vindex gnus-treat-play-sounds
 @item gnus-treat-play-sounds
-@vindex gnus-treat-translate
-@item gnus-treat-translate
 @item gnus-treat-ansi-sequences (t)
 @vindex gnus-treat-x-pgp-sig
 @item gnus-treat-x-pgp-sig (head)
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index b62c702ed47..246fc048b0c 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,16 @@
+2010-09-25  Julien Danjou  <julien@danjou.info>
+
+        * 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  <julien@danjou.info>
 
         * gnus-sum.el: Add support for Gravatars.
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index 231f9e90e44..35a6934b971 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -1609,15 +1609,6 @@ predicate.  See Info node `(gnus)Customizing Articles'."
   :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.
diff --git a/lisp/gnus/gnus-gravatar.el b/lisp/gnus/gnus-gravatar.el
index 6b97a54845b..54679f43ff3 100644
--- a/lisp/gnus/gnus-gravatar.el
+++ b/lisp/gnus/gnus-gravatar.el
@@ -54,11 +54,12 @@ unpressed button."
                (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.
diff --git a/lisp/gnus/gnus.el b/lisp/gnus/gnus.el
index 5aea6634a96..a9ab7ed97fb 100644
--- a/lisp/gnus/gnus.el
+++ b/lisp/gnus/gnus.el
@@ -1428,15 +1428,6 @@ you could set this variable:
   "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.")
diff --git a/lisp/gnus/mml-smime.el b/lisp/gnus/mml-smime.el
index 17732997e63..a99538be0af 100644
--- a/lisp/gnus/mml-smime.el
+++ b/lisp/gnus/mml-smime.el
@@ -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
diff --git a/lisp/gnus/mml2015.el b/lisp/gnus/mml2015.el
index 838813e0f19..fb581086512 100644
--- a/lisp/gnus/mml2015.el
+++ b/lisp/gnus/mml2015.el
@@ -119,11 +119,6 @@ Valid packages include `epg', `pgg', `gpg' and `mailcrypt'.")
   :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