*** empty log message ***

2 files changed, 4 insertions, 4 deletions

diff --git a/src/frame.c b/src/frame.c
index 41df7e26caf..1068c2e2e01 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -641,7 +641,9 @@ WARNING:  If you use this under X, you should do `unfocus-screen' afterwards.")
 
 #if 0
 /* ??? Can this be replaced with a Lisp function?
-   It is used in minibuf.c.  Can we get rid of that?  */
+   It is used in minibuf.c.  Can we get rid of that?
+   Yes.  All uses in minibuf.c are gone, and parallels to these
+   functions have been defined in screen.el.  */
 
 DEFUN ("screen-configuration", Fscreen_configuration, Sscreen_configuration,
        0, 0, 0,
@@ -872,7 +874,7 @@ store_screen_param (s, prop, val)
         error ("Surrogate minibuffer windows must be minibuffer windows.");
 
       if (SCREEN_HAS_MINIBUF (s) || SCREEN_MINIBUF_ONLY_P (s))
-        error ("Can't change surrogate minibuffer on screens with their own minibuffers.");
+        error ("Can't change the surrogate minibuffer of a screen with its own minibuffer.");
 
       /* Install the chosen minibuffer window, with proper buffer.  */
       s->minibuffer_window = val;
diff --git a/src/xterm.c b/src/xterm.c
index 5261ed7158c..43f59d03ad2 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -3374,10 +3374,8 @@ x_make_screen_visible (s)
   if (! SCREEN_VISIBLE_P (s))
     {
 #ifdef HAVE_X11
-#if 0
       if (! EQ (Vx_no_window_manager, Qt))
         x_wm_set_window_state (s, NormalState);
-#endif
 
       XMapWindow (XDISPLAY s->display.x->window_desc);
       if (s->display.x->v_scrollbar != 0 || s->display.x->h_scrollbar != 0)