*** empty log message ***

2 files changed, 4 insertions, 0 deletions

diff --git a/lisp/startup.el b/lisp/startup.el
index 067ecc28745..0bfcf5ecf18 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -338,6 +338,8 @@ Type \\[describe-distribution] for information on getting the latest version."))
                  (setq command-line-args-left (cdr command-line-args-left)))
                 ((or (string-equal argi "-i")
                      (string-equal argi "-insert"))
+                 (or (stringp (car command-line-args-left))
+                     (error "filename omitted from `-i' option"))
                  (insert-file-contents (car command-line-args-left))
                  (setq command-line-args-left (cdr command-line-args-left)))
                 ((string-equal argi "-kill")
diff --git a/src/xterm.c b/src/xterm.c
index 43f59d03ad2..5261ed7158c 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -3374,8 +3374,10 @@ 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)