comparison src/frame.c @ 109689:ffde65bb1dd2

merge emacs-23

108493:e5f3704cf67a

Lisp_Object Qcursor_color, Qcursor_type;
Lisp_Object Qgeometry;  /* Not used */
Lisp_Object Qheight, Qwidth;
Lisp_Object Qleft, Qright;
Lisp_Object Qicon_left, Qicon_top, Qicon_type, Qicon_name;
Lisp_Object Qinternal_border_width;
Lisp_Object Qmouse_color;
Lisp_Object Qminibuffer;
Lisp_Object Qscroll_bar_width, Qvertical_scroll_bars;
Lisp_Object Qvisibility;

{
  struct frame *f;
  struct frame *sf = SELECTED_FRAME ();
  struct kboard *kb;

  int minibuffer_selected;

  if (EQ (frame, Qnil))
    {
      f = sf;
      XSETFRAME (frame, f);

		error ("Attempt to delete a surrogate minibuffer frame");
	    }
	}
    }

  /* Run `delete-frame-functions' unless FORCE is `noelisp' or
     frame is a tooltip.  FORCE is set to `noelisp' when handling
     a disconnect from the terminal, so we don't dare call Lisp
     code.  */
  if (NILP (Vrun_hooks) || !NILP (Fframe_parameter (frame, intern ("tooltip"))))
    ;
  if (EQ (force, Qnoelisp))
    pending_funcalls
      = Fcons (list3 (Qrun_hook_with_args, Qdelete_frame_functions, frame),
	       pending_funcalls);
  else
    safe_call2 (Qrun_hook_with_args, Qdelete_frame_functions, frame);

	/* No frames left on this kboard--say no minibuffer either.  */
	kb->Vdefault_minibuffer_frame = Qnil;
    }

  /* Cause frame titles to update--necessary if we now have just one frame.  */
  update_mode_lines = 1;

  return Qnil;
}

DEFUN ("delete-frame", Fdelete_frame, Sdelete_frame, 0, 2, "",

  staticpro (&Qgeometry);
  Qicon_left = intern_c_string ("icon-left");
  staticpro (&Qicon_left);
  Qicon_top = intern_c_string ("icon-top");
  staticpro (&Qicon_top);
  Qleft = intern_c_string ("left");
  staticpro (&Qleft);
  Qright = intern_c_string ("right");
  staticpro (&Qright);
  Quser_position = intern_c_string ("user-position");

109689:ffde65bb1dd2

Lisp_Object Qcursor_color, Qcursor_type;
Lisp_Object Qgeometry;  /* Not used */
Lisp_Object Qheight, Qwidth;
Lisp_Object Qleft, Qright;
Lisp_Object Qicon_left, Qicon_top, Qicon_type, Qicon_name;
Lisp_Object Qtooltip;
Lisp_Object Qinternal_border_width;
Lisp_Object Qmouse_color;
Lisp_Object Qminibuffer;
Lisp_Object Qscroll_bar_width, Qvertical_scroll_bars;
Lisp_Object Qvisibility;

{
  struct frame *f;
  struct frame *sf = SELECTED_FRAME ();
  struct kboard *kb;

  int minibuffer_selected, tooltip_frame;

  if (EQ (frame, Qnil))
    {
      f = sf;
      XSETFRAME (frame, f);

		error ("Attempt to delete a surrogate minibuffer frame");
	    }
	}
    }

  tooltip_frame = !NILP (Fframe_parameter (frame, intern ("tooltip")));

  /* Run `delete-frame-functions' unless FORCE is `noelisp' or
     frame is a tooltip.  FORCE is set to `noelisp' when handling
     a disconnect from the terminal, so we don't dare call Lisp
     code.  */
  if (NILP (Vrun_hooks) || tooltip_frame)
    ;
  else if (EQ (force, Qnoelisp))
    pending_funcalls
      = Fcons (list3 (Qrun_hook_with_args, Qdelete_frame_functions, frame),
	       pending_funcalls);
  else
    safe_call2 (Qrun_hook_with_args, Qdelete_frame_functions, frame);

	/* No frames left on this kboard--say no minibuffer either.  */
	kb->Vdefault_minibuffer_frame = Qnil;
    }

  /* Cause frame titles to update--necessary if we now have just one frame.  */
  if (!tooltip_frame)
    update_mode_lines = 1;

  return Qnil;
}

DEFUN ("delete-frame", Fdelete_frame, Sdelete_frame, 0, 2, "",

  staticpro (&Qgeometry);
  Qicon_left = intern_c_string ("icon-left");
  staticpro (&Qicon_left);
  Qicon_top = intern_c_string ("icon-top");
  staticpro (&Qicon_top);
  Qtooltip = intern_c_string ("tooltip");
  staticpro (&Qtooltip);
  Qleft = intern_c_string ("left");
  staticpro (&Qleft);
  Qright = intern_c_string ("right");
  staticpro (&Qright);
  Quser_position = intern_c_string ("user-position");