Port tls.el to older Emacs

* lisp/net/tls.el (tls-format-message):
Alias to format-message, or format if not available.
(open-tls-stream): Use it.

diff --git a/lisp/net/tls.el b/lisp/net/tls.el
index 1226916275cfd133c9f20bdff61e38f60b78bf70..46891be38e6f42dcdac1d41c1c6d6474ce62ab77 100644 (file)
--- a/lisp/net/tls.el
+++ b/lisp/net/tls.el
@@ -174,6 +174,12 @@ Used by `tls-certificate-information'."
   :type 'string
   :group 'tls)
 
+(eval-and-compile
+  (if (fboundp 'format-message)
+      (defalias 'tls-format-message 'format-message)
+    ;; for Emacs < 25, and XEmacs, don't worry about quote translation.
+    (defalias 'tls-format-message 'format)))
+
 (defun tls-certificate-information (der)
   "Parse X.509 certificate in DER format into an assoc list."
   (let ((certificate (concat "-----BEGIN CERTIFICATE-----\n"
@@ -275,8 +281,8 @@ Fourth arg PORT is an integer specifying a port to connect to."
                             (message "The certificate presented by `%s' is \
 NOT trusted." host))
                        (not (yes-or-no-p
-                             (format-message "The certificate presented by `%s' is \
-NOT trusted. Accept anyway? " host)))))
+                             (tls-format-message "\
+The certificate presented by `%s' is NOT trusted. Accept anyway? " host)))))
                  (and tls-hostmismatch
                       (save-excursion
                         (goto-char (point-min))