aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Ingebrigtsen2016-02-05 17:48:44 +1100
committerLars Ingebrigtsen2016-02-06 14:08:26 +1100
commitc6d4b63f25fd44f22c5de4c8f5017812b7017ff6 (patch)
treeb8398f1f37dbc7a2225ec8165d32b2ac61e3b0e2
parent130056880fe9d807fbaee5bc5f68249ea9cf6438 (diff)
downloademacs-c6d4b63f25fd44f22c5de4c8f5017812b7017ff6.tar.gz
emacs-c6d4b63f25fd44f22c5de4c8f5017812b7017ff6.zip
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).
-rw-r--r--lisp/net/nsm.el8
1 files changed, 7 insertions, 1 deletions
diff --git a/lisp/net/nsm.el b/lisp/net/nsm.el
index d93b1bb14db..72bff66c381 100644
--- a/lisp/net/nsm.el
+++ b/lisp/net/nsm.el
@@ -307,7 +307,13 @@ unencrypted."
307 (quit 'no) 307 (quit 'no)
308 (error 'no)))) 308 (error 'no))))
309 (if (eq response 'no) 309 (if (eq response 'no)
310 nil 310 (progn
311 (message "Aborting connection to %s:%s" host port)
312 nil)
313 (message (if (eq response 'session)
314 "Accepting certificate for %s:%s this session only"
315 "Permanently accepting certificate for %s:%s")
316 host port)
311 (nsm-save-host host port status what response) 317 (nsm-save-host host port status what response)
312 t)))) 318 t))))
313 319