# HG changeset patch
# User Jim Blandy <jimb@redhat.com>
# Date 710534162 0
# Node ID 4714ad36583cad2716542baad030470603378ce9
# Parent  701693a7acb71858e61cecde3a0ae8134f6359e2
*** empty log message ***

diff -r 701693a7acb7 -r 4714ad36583c lisp/startup.el
--- a/lisp/startup.el	Tue Jul 07 17:57:20 1992 +0000
+++ b/lisp/startup.el	Tue Jul 07 18:36:02 1992 +0000
@@ -338,6 +338,8 @@
 		 (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 -r 701693a7acb7 -r 4714ad36583c src/xterm.c
--- a/src/xterm.c	Tue Jul 07 17:57:20 1992 +0000
+++ b/src/xterm.c	Tue Jul 07 18:36:02 1992 +0000
@@ -3374,8 +3374,10 @@
   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)