(select-safe-coding-system): Call pop-to-buffer inside

save-window-excursion and save-excursion.

diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index 1b59acdf67a79225a3b6464d5c514d77c712d2a5..0493bbfc4e7d29ddefd38f17f227910b5e8f8954 100644 (file)
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -676,15 +676,15 @@ and TO is ignored."
                          (coding-system-category elt)))
            (push elt l))))
 
-      ;; Make sure the offending buffer is displayed.
-      (or (stringp from)
-         (pop-to-buffer bufname))
-      (save-excursion
-       (goto-char (unencodable-char-position
-                   from to (mapcar #'car default-coding-system)))
-       ;; Then ask users to select one form CODINGS.
-       (unwind-protect
-           (save-window-excursion
+      (unwind-protect
+         (save-window-excursion
+           (save-excursion
+             ;; Make sure the offending buffer is displayed.
+             (unless (stringp from)
+               (pop-to-buffer bufname)
+               (goto-char (unencodable-char-position
+                               from to (mapcar #'car default-coding-system))))
+             ;; Then ask users to select one from CODINGS.
              (with-output-to-temp-buffer "*Warning*"
                (save-excursion
                  (set-buffer standard-output)