From 9b59bbc726ce58ee2923a0e3eff5b05523e88630 Mon Sep 17 00:00:00 2001 From: Katsumi Yamaoka Date: Tue, 1 Sep 2015 23:00:14 +0000 Subject: [PATCH] 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. --- lisp/ChangeLog | 4 ++++ lisp/gnus-util.el | 8 ++++---- lisp/tls.el | 7 +++---- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index dd819dbcb..d3e1e2bf7 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,9 @@ 2015-09-01 Katsumi Yamaoka + * 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 54cf099e0..215eac88a 100644 --- 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 46891be38..544aec5cf 100644 --- 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." -- 2.25.1