[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/frame.c
From: |
Ken Raeburn |
Subject: |
[Emacs-diffs] Changes to emacs/src/frame.c |
Date: |
Sun, 14 Jul 2002 20:00:51 -0400 |
Index: emacs/src/frame.c
diff -c emacs/src/frame.c:1.286 emacs/src/frame.c:1.287
*** emacs/src/frame.c:1.286 Wed Jul 10 04:44:52 2002
--- emacs/src/frame.c Sun Jul 14 20:00:36 2002
***************
*** 293,299 ****
buf = Fcurrent_buffer ();
/* If buf is a 'hidden' buffer (i.e. one whose name starts with
a space), try to find another one. */
! if (XSTRING (Fbuffer_name (buf))->data[0] == ' ')
buf = Fother_buffer (buf, Qnil, Qnil);
/* Use set_window_buffer, not Fset_window_buffer, and don't let
--- 293,299 ----
buf = Fcurrent_buffer ();
/* If buf is a 'hidden' buffer (i.e. one whose name starts with
a space), try to find another one. */
! if (SREF (Fbuffer_name (buf), 0) == ' ')
buf = Fother_buffer (buf, Qnil, Qnil);
/* Use set_window_buffer, not Fset_window_buffer, and don't let
***************
*** 1115,1121 ****
#ifdef MAC_OS8
/* Terminal frame deleted before any other visible frames are
created. */
! && strcmp (XSTRING (f->name)->data, "F1") != 0
#endif
)
error ("Attempt to delete the sole visible or iconified frame");
--- 1115,1121 ----
#ifdef MAC_OS8
/* Terminal frame deleted before any other visible frames are
created. */
! && strcmp (SDATA (f->name), "F1") != 0
#endif
)
error ("Attempt to delete the sole visible or iconified frame");
***************
*** 1869,1876 ****
/* Check for no change needed in this very common case
before we do any consing. */
! if (frame_name_fnn_p (XSTRING (f->name)->data,
! STRING_BYTES (XSTRING (f->name))))
return;
terminal_frame_count++;
--- 1869,1876 ----
/* Check for no change needed in this very common case
before we do any consing. */
! if (frame_name_fnn_p (SDATA (f->name),
! SBYTES (f->name)))
return;
terminal_frame_count++;
***************
*** 1887,1893 ****
/* Don't allow the user to set the frame name to F<num>, so it
doesn't clash with the names we generate for terminal frames. */
! if (frame_name_fnn_p (XSTRING (name)->data, STRING_BYTES (XSTRING
(name))))
error ("Frame names of the form F<num> are usurped by Emacs");
}
--- 1887,1893 ----
/* Don't allow the user to set the frame name to F<num>, so it
doesn't clash with the names we generate for terminal frames. */
! if (frame_name_fnn_p (SDATA (name), SBYTES (name)))
error ("Frame names of the form F<num> are usurped by Emacs");
}
***************
*** 2005,2017 ****
elt = Fassq (Qforeground_color, alist);
if (!NILP (elt) && CONSP (elt) && STRINGP (XCDR (elt)))
{
! if (strncmp (XSTRING (XCDR (elt))->data,
unspecified_bg,
! XSTRING (XCDR (elt))->size) == 0)
store_in_alist (&alist, Qforeground_color, tty_color_name (f, bg));
! else if (strncmp (XSTRING (XCDR (elt))->data,
unspecified_fg,
! XSTRING (XCDR (elt))->size) == 0)
store_in_alist (&alist, Qforeground_color, tty_color_name (f, fg));
}
else
--- 2005,2017 ----
elt = Fassq (Qforeground_color, alist);
if (!NILP (elt) && CONSP (elt) && STRINGP (XCDR (elt)))
{
! if (strncmp (SDATA (XCDR (elt)),
unspecified_bg,
! SCHARS (XCDR (elt))) == 0)
store_in_alist (&alist, Qforeground_color, tty_color_name (f, bg));
! else if (strncmp (SDATA (XCDR (elt)),
unspecified_fg,
! SCHARS (XCDR (elt))) == 0)
store_in_alist (&alist, Qforeground_color, tty_color_name (f, fg));
}
else
***************
*** 2019,2031 ****
elt = Fassq (Qbackground_color, alist);
if (!NILP (elt) && CONSP (elt) && STRINGP (XCDR (elt)))
{
! if (strncmp (XSTRING (XCDR (elt))->data,
unspecified_fg,
! XSTRING (XCDR (elt))->size) == 0)
store_in_alist (&alist, Qbackground_color, tty_color_name (f, fg));
! else if (strncmp (XSTRING (XCDR (elt))->data,
unspecified_bg,
! XSTRING (XCDR (elt))->size) == 0)
store_in_alist (&alist, Qbackground_color, tty_color_name (f, bg));
}
else
--- 2019,2031 ----
elt = Fassq (Qbackground_color, alist);
if (!NILP (elt) && CONSP (elt) && STRINGP (XCDR (elt)))
{
! if (strncmp (SDATA (XCDR (elt)),
unspecified_fg,
! SCHARS (XCDR (elt))) == 0)
store_in_alist (&alist, Qbackground_color, tty_color_name (f, fg));
! else if (strncmp (SDATA (XCDR (elt)),
unspecified_bg,
! SCHARS (XCDR (elt))) == 0)
store_in_alist (&alist, Qbackground_color, tty_color_name (f, bg));
}
else
***************
*** 2112,2119 ****
if (EQ (parameter, Qbackground_color))
{
! color_name = XSTRING (value)->data;
! csz = XSTRING (value)->size;
if (strncmp (color_name, unspecified_bg, csz) == 0)
value = tty_color_name (f, FRAME_BACKGROUND_PIXEL (f));
else if (strncmp (color_name, unspecified_fg, csz) == 0)
--- 2112,2119 ----
if (EQ (parameter, Qbackground_color))
{
! color_name = SDATA (value);
! csz = SCHARS (value);
if (strncmp (color_name, unspecified_bg, csz) == 0)
value = tty_color_name (f, FRAME_BACKGROUND_PIXEL (f));
else if (strncmp (color_name, unspecified_fg, csz) == 0)
***************
*** 2121,2128 ****
}
else if (EQ (parameter, Qforeground_color))
{
! color_name = XSTRING (value)->data;
! csz = XSTRING (value)->size;
if (strncmp (color_name, unspecified_fg, csz) == 0)
value = tty_color_name (f, FRAME_FOREGROUND_PIXEL (f));
else if (strncmp (color_name, unspecified_bg, csz) == 0)
--- 2121,2128 ----
}
else if (EQ (parameter, Qforeground_color))
{
! color_name = SDATA (value);
! csz = SCHARS (value);
if (strncmp (color_name, unspecified_fg, csz) == 0)
value = tty_color_name (f, FRAME_FOREGROUND_PIXEL (f));
else if (strncmp (color_name, unspecified_bg, csz) == 0)