From 1ef309fc88368f0ff51865be94ef4a8efd01f3fe Mon Sep 17 00:00:00 2001
From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Fri, 5 Feb 2016 17:35:29 +1100
Subject: [PATCH] Restore window conf in nsm

* lisp/net/nsm.el (nsm-query-user): Restore the window configuration.

Backport:
---
 lisp/net/nsm.el | 67 +++++++++++++++++++++++++------------------------
 1 file changed, 34 insertions(+), 33 deletions(-)

diff --git a/lisp/net/nsm.el b/lisp/net/nsm.el
index ee8b55bf192..d0b55437732 100644
--- a/lisp/net/nsm.el
+++ b/lisp/net/nsm.el
@@ -309,39 +309,40 @@ unencrypted."
 
 (defun nsm-query-user (message args cert)
   (let ((buffer (get-buffer-create "*Network Security Manager*")))
-    (with-help-window buffer
-      (with-current-buffer buffer
-	(erase-buffer)
-	(when (> (length cert) 0)
-	  (insert cert "\n"))
-	(let ((start (point)))
-	  (insert (apply #'format-message message args))
-	  (goto-char start)
-	  ;; Fill the first line of the message, which usually
-	  ;; contains lots of explanatory text.
-	  (fill-region (point) (line-end-position)))))
-    (let ((responses '((?n . no)
-		       (?s . session)
-		       (?a . always)))
-	  (prefix "")
-	  (cursor-in-echo-area t)
-	  response)
-      (while (not response)
-	(setq response
-	      (cdr
-	       (assq (downcase
-		      (read-char
-		       (concat prefix
-			       "Continue connecting? (No, Session only, Always) ")))
-		     responses)))
-	(unless response
-	  (ding)
-	  (setq prefix "Invalid choice.  ")))
-      (kill-buffer buffer)
-      ;; If called from a callback, `read-char' will insert things
-      ;; into the pending input.  Clear that.
-      (clear-this-command-keys)
-      response)))
+    (save-window-excursion
+      (with-help-window buffer
+        (with-current-buffer buffer
+          (erase-buffer)
+          (when (> (length cert) 0)
+            (insert cert "\n"))
+          (let ((start (point)))
+            (insert (apply #'format-message message args))
+            (goto-char start)
+            ;; Fill the first line of the message, which usually
+            ;; contains lots of explanatory text.
+            (fill-region (point) (line-end-position)))))
+      (let ((responses '((?n . no)
+                         (?s . session)
+                         (?a . always)))
+            (prefix "")
+            (cursor-in-echo-area t)
+            response)
+        (while (not response)
+          (setq response
+                (cdr
+                 (assq (downcase
+                        (read-char
+                         (concat prefix
+                                 "Continue connecting? (No, Session only, Always) ")))
+                       responses)))
+          (unless response
+            (ding)
+            (setq prefix "Invalid choice.  ")))
+        (kill-buffer buffer)
+        ;; If called from a callback, `read-char' will insert things
+        ;; into the pending input.  Clear that.
+        (clear-this-command-keys)
+        response))))
 
 (defun nsm-save-host (host port status what permanency)
   (let* ((id (nsm-id host port))
-- 
2.39.2