lisp/gnus/mm-util.el (mm-make-temp-file): Alias to make-temp-file for modern Emacsen

2 files changed, 11 insertions, 7 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 83b66f78f64..7cee21522b6 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2013-12-17  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * mm-util.el (mm-make-temp-file):
+        Alias to make-temp-file for modern Emacsen.
+
 2013-12-08  Katsumi Yamaoka  <yamaoka@jpl.org>
 
         * gnus-msg.el (gnus-setup-message): Fix the type of argument passed to
diff --git a/lisp/gnus/mm-util.el b/lisp/gnus/mm-util.el
index 5b0fd6860a0..7ccf1c9e9ee 100644
--- a/lisp/gnus/mm-util.el
+++ b/lisp/gnus/mm-util.el
@@ -1382,13 +1382,12 @@ If INHIBIT is non-nil, inhibit `mm-inhibit-file-name-handlers'."
 ;; It is not a MIME function, but some MIME functions use it.
 (if (and (fboundp 'make-temp-file)
          (ignore-errors
-           (let ((def (symbol-function 'make-temp-file)))
-             (and (byte-code-function-p def)
-                  (setq def (if (fboundp 'compiled-function-arglist)
-                                ;; XEmacs
-                                (eval (list 'compiled-function-arglist def))
-                              (aref def 0)))
-                  (>= (length def) 4)
+           (let ((def (if (fboundp 'compiled-function-arglist) ;; XEmacs
+                          (eval (list 'compiled-function-arglist
+                                      (symbol-function 'make-temp-file)))
+                        (require 'help-fns)
+                        (help-function-arglist 'make-temp-file t))))
+             (and (>= (length def) 4)
                   (eq (nth 3 def) 'suffix)))))
     (defalias 'mm-make-temp-file 'make-temp-file)
   ;; Stolen (and modified for XEmacs) from Emacs 22.