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

1 files changed, 5 insertions, 2 deletions

diff --git a/src/xfns.c b/src/xfns.c
index 3616b4a7100..d3067e00fe8 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -2830,12 +2830,15 @@ x_icon (f, parms)
   if (! EQ (icon_x, Qunbound))
     x_wm_set_icon_position (f, XINT (icon_x), XINT (icon_y));
 
+#if 0 /* x_get_arg removes the visibility parameter as a side effect,
+         but x_create_frame still needs it.  */
   /* Start up iconic or window? */
   x_wm_set_window_state
     (f, (EQ (x_get_arg (dpyinfo, parms, Qvisibility, 0, 0, RES_TYPE_SYMBOL),
              Qicon)
          ? IconicState
          : NormalState));
+#endif
 
   x_text_icon (f, (char *) SDATA ((!NILP (f->icon_name)
                                      ? f->icon_name
@@ -3169,8 +3172,6 @@ This function is an internal primitive--use `make-frame' instead.  */)
       specbind (Qx_resource_name, name);
     }
 
-  Fmodify_frame_parameters (frame, Fcons (Fcons (Qwindow_system, Qx), Qnil));
-
   /* Extract the window parameters from the supplied values
      that are needed to determine window geometry.  */
   {
@@ -3410,6 +3411,8 @@ This function is an internal primitive--use `make-frame' instead.  */)
     if (CONSP (XCAR (tem)) && !NILP (XCAR (XCAR (tem))))
       f->param_alist = Fcons (XCAR (tem), f->param_alist);
 
+  store_frame_param (f, Qwindow_system, Qx);
+
   UNGCPRO;
 
   /* Make sure windows on this frame appear in calls to next-window