Fix ediff problems. (Reported by Dan Nicolaescu.)

* lisp/subr.el (with-selected-frame): Make sure the current buffer is
  restored as well.

* src/xfns.c (Fx_create_frame): Use `store_frame_param' to set
  `window-system' frame parameter, and make sure it overrides any
  user-supplied setting.

* src/xfns.c (x_icon): Disable redundant call to
  `x_wm_set_window_state'. (Also applied in CVS.)

* lisp/faces.el (x-create-frame-with-faces): Don't make frame visible
  until we are done setting up all its parameters.

* lisp/ediff-wind.el (ediff-setup-windows-automatic): New function.
  (ediff-window-setup-function): Use it as default.

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-528

3 files changed, 30 insertions, 18 deletions

diff --git a/lisp/ediff-wind.el b/lisp/ediff-wind.el
index 28369f9f6bd..5e9381f5dab 100644
--- a/lisp/ediff-wind.el
+++ b/lisp/ediff-wind.el
@@ -72,15 +72,15 @@
   :group 'frames)
 
 
-(defcustom ediff-window-setup-function (if (ediff-window-display-p)
-					'ediff-setup-windows-multiframe
-				      'ediff-setup-windows-plain)
+(defcustom ediff-window-setup-function 'ediff-setup-windows-automatic)
   "*Function called to set up windows.
-Ediff provides a choice of two functions: `ediff-setup-windows-plain', for
-doing everything in one frame, and `ediff-setup-windows-multiframe',
-which sets the control panel in a separate frame.  Also, if the latter
-function detects that one of the buffers A/B is seen in some other frame,
-it will try to keep that buffer in that frame.
+Ediff provides a choice of three functions: `ediff-setup-windows-plain', for
+doing everything in one frame, `ediff-setup-windows-multiframe', which sets
+the control panel in a separate frame, and
+`ediff-setup-windows-automatic' (the default), which chooses an appropriate
+behaviour based on the current window system.  If the multiframe function
+detects that one of the buffers A/B is seen in some other frame, it will try
+to keep that buffer in that frame.
 
 If you don't like the two functions provided---write your own one.
 The basic guidelines:
@@ -94,7 +94,8 @@ The basic guidelines:
        Buffer C may not be used in jobs that compare only two buffers.
 If you plan to do something fancy, take a close look at how the two
 provided functions are written."
-  :type '(choice (const :tag "Multi Frame" ediff-setup-windows-multiframe)
+  :type '(choice (const :tag "Automatic" ediff-setup-windows-automatic)
+		 (const :tag "Multi Frame" ediff-setup-windows-multiframe)
 		 (const :tag "Single Frame" ediff-setup-windows-plain)
 		 (function :tag "Other function"))
   :group 'ediff-window)
@@ -333,6 +334,12 @@ into icons, regardless of the window manager."
        buffer-A buffer-B buffer-C control-buffer))
   (run-hooks 'ediff-after-setup-windows-hook))
 
+;; Set up windows using the correct method based on the current window system.
+(defun ediff-setup-windows-automatic (buffer-A buffer-B buffer-C control-buffer)
+  (if (ediff-window-display-p)
+      (ediff-setup-windows-multiframe buffer-A buffer-B buffer-C control-buffer)
+    (ediff-setup-windows-plain buffer-A buffer-B buffer-C control-buffer)))
+
 ;; Just set up 3 windows.
 ;; Usually used without windowing systems
 ;; With windowing, we want to use dedicated frames.
diff --git a/lisp/faces.el b/lisp/faces.el
index ee11868b549..b1906faee87 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -1734,14 +1734,14 @@ Value is the new frame created."
 	  (x-handle-reverse-video frame parameters)
 	  (frame-set-background-mode frame)
 	  (face-set-after-frame-default frame)
-	  (if (or (null frame-list) (null visibility-spec))
-	      (make-frame-visible frame)
-	    (modify-frame-parameters frame (list visibility-spec)))
 	  ;; Arrange for the kill and yank functions to set and check the clipboard.
 	  (modify-frame-parameters
 	   frame '((interprogram-cut-function . x-select-text)))
 	  (modify-frame-parameters
 	   frame '((interprogram-paste-function . x-cut-buffer-or-selection-value)))
+	  (if (or (null frame-list) (null visibility-spec))
+	      (make-frame-visible frame)
+	    (modify-frame-parameters frame (list visibility-spec)))
 	  (setq success t))
       (unless success
 	(delete-frame frame)))
diff --git a/lisp/subr.el b/lisp/subr.el
index ef49c9b1c9a..6c473e5a686 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -2130,12 +2130,17 @@ See also `with-temp-buffer'."
 The value returned is the value of the last form in BODY.
 See also `with-temp-buffer'."
   (declare (indent 1) (debug t))
-  `(let ((save-selected-frame (selected-frame)))
-     (unwind-protect
-	 (progn (select-frame ,frame)
-		,@body)
-       (if (frame-live-p save-selected-frame)
-	   (select-frame save-selected-frame)))))
+  (let ((old-frame (make-symbol "old-frame"))
+	(old-buffer (make-symbol "old-buffer")))
+    `(let ((,old-frame (selected-frame))
+	   (,old-buffer (current-buffer)))
+       (unwind-protect
+	   (progn (select-frame ,frame)
+		  ,@body)
+	 (if (frame-live-p ,old-frame)
+	     (select-frame ,old-frame))
+	 (if (buffer-live-p ,old-buffer)
+	     (set-buffer ,old-buffer))))))
 
 (defmacro with-temp-file (file &rest body)
   "Create a new buffer, evaluate BODY there, and write the buffer to FILE.