[gnus git] branch master updated: m0-13-55-g80adb64 =1= tls.el: Compilation fix

       via  80adb645d1b56d7f2c28700a174052b5758ea015 (commit)
      from  851278bf56a0156a4dd5896e9959f63e33d07ee2 (commit)


- Log -----------------------------------------------------------------
commit 80adb645d1b56d7f2c28700a174052b5758ea015
Author: Katsumi Yamaoka <[email protected]>
Date:   Mon Aug 31 23:41:00 2015 +0000

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 17d81a2..137dd34 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2015-08-31  Katsumi Yamaoka  <[email protected]>
+
+	* tls.el (tls-format-message):
+	Alias to format-message, or format if not available.
+	(open-tls-stream): Use it.
+
 2015-08-31  Paul Eggert  <[email protected]>
 
 	* gnus-agent.el (gnus-agent-possibly-synchronize-flags-server):
diff --git a/lisp/tls.el b/lisp/tls.el
index 1226916..a068675 100644
--- a/lisp/tls.el
+++ b/lisp/tls.el
@@ -174,6 +174,11 @@ Used by `tls-certificate-information'."
   :type 'string
   :group 'tls)
 
+(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 +280,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))

-----------------------------------------------------------------------
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we listed those
revisions in full, above.

Summary of changes:
 lisp/ChangeLog |    6 ++++++
 lisp/tls.el    |    9 +++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnus Project".

The branch, master has been updated


hooks/post-receive
-- 
Gnus Project