emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] scratch/backports-25.2 145e369 05/46: Make the nsm query s


From: Noam Postavsky
Subject: [Emacs-diffs] scratch/backports-25.2 145e369 05/46: Make the nsm query say what it did after the user interaction
Date: Sun, 2 Oct 2016 14:04:47 +0000 (UTC)

branch: scratch/backports-25.2
commit 145e3695e0587da45b07482a3b88176a49aad24e
Author: Lars Ingebrigtsen <address@hidden>
Commit: Noam Postavsky <address@hidden>

    Make the nsm query say what it did after the user interaction
    
    * lisp/net/nsm.el (nsm-query): Issue a message about
    aborting/accepting messages (suggested by N. Jackson)
    (bug#22531).
    
    (cherry picked from commit c6d4b63f25fd44f22c5de4c8f5017812b7017ff6)
---
 lisp/net/nsm.el |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/lisp/net/nsm.el b/lisp/net/nsm.el
index d0b5543..8d22333 100644
--- a/lisp/net/nsm.el
+++ b/lisp/net/nsm.el
@@ -303,7 +303,13 @@ unencrypted."
             (quit 'no)
             (error 'no))))
       (if (eq response 'no)
-         nil
+          (progn
+            (message "Aborting connection to %s:%s" host port)
+            nil)
+        (message (if (eq response 'session)
+                     "Accepting certificate for %s:%s this session only"
+                   "Permanently accepting certificate for %s:%s")
+                 host port)
        (nsm-save-host host port status what response)
        t))))
 



reply via email to

[Prev in Thread] Current Thread [Next in Thread]