Commit cf91c6c8 authored by Jim Blandy's avatar Jim Blandy

*** empty log message ***

parent ca04638e
......@@ -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")
......
......@@ -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)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment