Use defalias at the top level

* gnus-util.el (gnus-format-message):
* tls.el (tls-format-message): Use defalias at the top level so as to
make eval-and-compile unnecessary.  Thanks to Stefan Monnier.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index dd819db..d3e1e2b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2015-09-01  Katsumi Yamaoka  <yamaoka@jpl.org>
 
+       * gnus-util.el (gnus-format-message):
+       * tls.el (tls-format-message): Use defalias at the top level so as to
+       make eval-and-compile unnecessary.  Thanks to Stefan Monnier.
+
        * gnus-sum.el (gnus-summary-search-article):
        Ensure that the article where the search word is found is displayed
        and pointed to in the summary buffer.

diff --git a/lisp/gnus-util.el b/lisp/gnus-util.el
index 54cf099..215eac8 100644 (file)
--- a/lisp/gnus-util.el
+++ b/lisp/gnus-util.el
@@ -1974,10 +1974,10 @@ to case differences."
               (string-equal (downcase str1) (downcase prefix))
             (string-equal str1 prefix))))))
 
-(if (fboundp 'format-message)
-    (defalias 'gnus-format-message 'format-message)
-  ;; for Emacs < 25, and XEmacs, don't worry about quote translation.
-  (defalias 'gnus-format-message 'format))
+(defalias 'gnus-format-message
+  (if (fboundp 'format-message) 'format-message
+    ;; for Emacs < 25, and XEmacs, don't worry about quote translation.
+    'format))
 
 ;; Simple check: can be a macro but this way, although slow, it's really clear.
 ;; We don't use `bound-and-true-p' because it's not in XEmacs.

diff --git a/lisp/tls.el b/lisp/tls.el
index 46891be..544aec5 100644 (file)
--- a/lisp/tls.el
+++ b/lisp/tls.el
@@ -174,11 +174,10 @@ Used by `tls-certificate-information'."
   :type 'string
   :group 'tls)
 
-(eval-and-compile
-  (if (fboundp 'format-message)
-      (defalias 'tls-format-message 'format-message)
+(defalias 'tls-format-message
+  (if (fboundp 'format-message) 'format-message
     ;; for Emacs < 25, and XEmacs, don't worry about quote translation.
-    (defalias 'tls-format-message 'format)))
+    'format))
 
 (defun tls-certificate-information (der)
   "Parse X.509 certificate in DER format into an assoc list."