# HG changeset patch
# User Kenichi Handa <handa@m17n.org>
# Date 1028722885 0
# Node ID fb00e3e4754de7a006c656de7705147611e05273
# Parent  666afeb4879ed13a595d00001c5cd4710ddb0c4e
(select-safe-coding-system): Call pop-to-buffer inside
save-window-excursion and save-excursion.

diff -r 666afeb4879e -r fb00e3e4754d lisp/international/mule-cmds.el
--- a/lisp/international/mule-cmds.el	Wed Aug 07 12:21:05 2002 +0000
+++ b/lisp/international/mule-cmds.el	Wed Aug 07 12:21:25 2002 +0000
@@ -676,15 +676,15 @@
 			  (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)