X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/f3be0025481f15717198befe557208614e513e92..0e963201d03d9229bb8ac4323291d2b0119526ed:/lisp/net/nsm.el

diff --git a/lisp/net/nsm.el b/lisp/net/nsm.el
index eb700d71c7..31f2b32792 100644
--- a/lisp/net/nsm.el
+++ b/lisp/net/nsm.el
@@ -1,6 +1,6 @@
 ;;; nsm.el --- Network Security Manager
 
-;; Copyright (C) 2014 Free Software Foundation, Inc.
+;; Copyright (C) 2014-2016 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: encryption, security, network
@@ -76,6 +76,8 @@ stored in plain text."
   "If non-nil, the connection is opened in a non-interactive context.
 This means that no queries should be performed.")
 
+(declare-function gnutls-peer-status "gnutls.c" (proc))
+
 (defun nsm-verify-connection (process host port &optional
 				      save-fingerprint warn-unencrypted)
   "Verify the security status of PROCESS that's connected to HOST:PORT.
@@ -122,6 +124,9 @@ unencrypted."
 	(nsm-check-protocol process host port status settings)
       process)))
 
+(declare-function gnutls-peer-status-warning-describe "gnutls.c"
+		  (status-symbol))
+
 (defun nsm-check-certificate (process host port status settings)
   (let ((warnings (plist-get status :warnings)))
     (cond
@@ -299,7 +304,7 @@ unencrypted."
 	(when (> (length cert) 0)
 	  (insert cert "\n"))
 	(let ((start (point)))
-	  (insert (apply 'format message args))
+	  (insert (apply #'format-message message args))
 	  (goto-char start)
 	  ;; Fill the first line of the message, which usually
 	  ;; contains lots of explanatory text.
@@ -308,6 +313,7 @@ unencrypted."
 		       (?s . session)
 		       (?a . always)))
 	  (prefix "")
+	  (cursor-in-echo-area t)
 	  response)
       (while (not response)
 	(setq response
@@ -315,7 +321,7 @@ unencrypted."
 	       (assq (downcase
 		      (read-char
 		       (concat prefix
-			       "Continue connecting? (No, Session only, Always)")))
+			       "Continue connecting? (No, Session only, Always) ")))
 		     responses)))
 	(unless response
 	  (ding)