merge from trunk

3 files changed, 8 insertions, 1 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 4e72ae06f51..9c11d17645c 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,5 +1,9 @@
 2013-09-13  Glenn Morris  <rgm@gnu.org>
 
+        * mml2015.el (gnus-create-image): Autoload it.
+
+        * gnus-spec.el (gnus-xmas-format): Fix weird error call.
+
         * gnus-html.el (declare-function): Add compat stub for ancient Emacs.
         (image-size): Declare.
 
diff --git a/lisp/gnus/gnus-spec.el b/lisp/gnus/gnus-spec.el
index 0ff8ec89ac1..a39f185b56d 100644
--- a/lisp/gnus/gnus-spec.el
+++ b/lisp/gnus/gnus-spec.el
@@ -512,7 +512,8 @@ are supported for %s."
           (delete-char -1))
          (t
           (if (null args)
-              (error 'wrong-number-of-arguments #'my-format n fstring))
+              (signal 'wrong-number-of-arguments
+                      (list #'gnus-xmas-format n fstring)))
           (let* ((minlen (string-to-number (or (match-string 2) "")))
                  (arg (car args))
                  (str (if (stringp arg) arg (format "%s" arg)))
diff --git a/lisp/gnus/mml2015.el b/lisp/gnus/mml2015.el
index 3efa5c23bb3..a2fa1a1c532 100644
--- a/lisp/gnus/mml2015.el
+++ b/lisp/gnus/mml2015.el
@@ -866,6 +866,8 @@ If set, it overrides the setting of `mml2015-sign-with-sender'."
         (setq secret-keys (cdr secret-keys))))
     secret-key))
 
+(autoload 'gnus-create-image "gnus-ems")
+
 (defun mml2015-epg-key-image (key-id)
   "Return the image of a key, if any"
   (with-temp-buffer