diff options
| author | K. Handa <handa@gnu.org> | 2015-09-02 18:28:54 +0900 |
|---|---|---|
| committer | K. Handa <handa@gnu.org> | 2015-09-02 18:28:54 +0900 |
| commit | e7b62736aade24620c8ba6fa6bd467d017f16ee0 (patch) | |
| tree | d00a2203437a168b2414c6b73afc00a88d90b4b1 /lisp/net/tls.el | |
| parent | ae08d073d7e2738580341534adc3c5924dc76860 (diff) | |
| parent | 30866274e21c5f0a1c5f60cfe290743e7d482349 (diff) | |
| download | emacs-e7b62736aade24620c8ba6fa6bd467d017f16ee0.tar.gz emacs-e7b62736aade24620c8ba6fa6bd467d017f16ee0.tar.bz2 emacs-e7b62736aade24620c8ba6fa6bd467d017f16ee0.zip | |
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
Diffstat (limited to 'lisp/net/tls.el')
| -rw-r--r-- | lisp/net/tls.el | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/lisp/net/tls.el b/lisp/net/tls.el index 46891be38e6..544aec5cfda 100644 --- a/lisp/net/tls.el +++ b/lisp/net/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." |