[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/xdisp.c
From: |
Kim F . Storm |
Subject: |
[Emacs-diffs] Changes to emacs/src/xdisp.c |
Date: |
Thu, 21 Apr 2005 19:45:28 -0400 |
Index: emacs/src/xdisp.c
diff -c emacs/src/xdisp.c:1.1002 emacs/src/xdisp.c:1.1003
*** emacs/src/xdisp.c:1.1002 Thu Apr 21 07:23:50 2005
--- emacs/src/xdisp.c Thu Apr 21 23:45:28 2005
***************
*** 16087,16093 ****
props = mode_line_string_face_prop;
else if (!NILP (mode_line_string_face))
{
! Lisp_Object face = Fsafe_plist_get (props, Qface);
props = Fcopy_sequence (props);
if (NILP (face))
face = mode_line_string_face;
--- 16087,16093 ----
props = mode_line_string_face_prop;
else if (!NILP (mode_line_string_face))
{
! Lisp_Object face = Fplist_get (props, Qface);
props = Fcopy_sequence (props);
if (NILP (face))
face = mode_line_string_face;
***************
*** 16112,16118 ****
Lisp_Object face;
if (NILP (props))
props = Ftext_properties_at (make_number (0), lisp_string);
! face = Fsafe_plist_get (props, Qface);
if (NILP (face))
face = mode_line_string_face;
else
--- 16112,16118 ----
Lisp_Object face;
if (NILP (props))
props = Ftext_properties_at (make_number (0), lisp_string);
! face = Fplist_get (props, Qface);
if (NILP (face))
face = mode_line_string_face;
else
***************
*** 18915,18928 ****
plist = XCDR (it->object);
/* Compute the width of the stretch. */
! if ((prop = Fsafe_plist_get (plist, QCwidth), !NILP (prop))
&& calc_pixel_width_or_height (&tem, it, prop, font, 1, 0))
{
/* Absolute width `:width WIDTH' specified and valid. */
zero_width_ok_p = 1;
width = (int)tem;
}
! else if (prop = Fsafe_plist_get (plist, QCrelative_width),
NUMVAL (prop) > 0)
{
/* Relative width `:relative-width FACTOR' specified and valid.
--- 18915,18928 ----
plist = XCDR (it->object);
/* Compute the width of the stretch. */
! if ((prop = Fplist_get (plist, QCwidth), !NILP (prop))
&& calc_pixel_width_or_height (&tem, it, prop, font, 1, 0))
{
/* Absolute width `:width WIDTH' specified and valid. */
zero_width_ok_p = 1;
width = (int)tem;
}
! else if (prop = Fplist_get (plist, QCrelative_width),
NUMVAL (prop) > 0)
{
/* Relative width `:relative-width FACTOR' specified and valid.
***************
*** 18946,18952 ****
x_produce_glyphs (&it2);
width = NUMVAL (prop) * it2.pixel_width;
}
! else if ((prop = Fsafe_plist_get (plist, QCalign_to), !NILP (prop))
&& calc_pixel_width_or_height (&tem, it, prop, font, 1, &align_to))
{
if (it->glyph_row == NULL || !it->glyph_row->mode_line_p)
--- 18946,18952 ----
x_produce_glyphs (&it2);
width = NUMVAL (prop) * it2.pixel_width;
}
! else if ((prop = Fplist_get (plist, QCalign_to), !NILP (prop))
&& calc_pixel_width_or_height (&tem, it, prop, font, 1, &align_to))
{
if (it->glyph_row == NULL || !it->glyph_row->mode_line_p)
***************
*** 18966,18978 ****
width = 1;
/* Compute height. */
! if ((prop = Fsafe_plist_get (plist, QCheight), !NILP (prop))
&& calc_pixel_width_or_height (&tem, it, prop, font, 0, 0))
{
height = (int)tem;
zero_height_ok_p = 1;
}
! else if (prop = Fsafe_plist_get (plist, QCrelative_height),
NUMVAL (prop) > 0)
height = FONT_HEIGHT (font) * NUMVAL (prop);
else
--- 18966,18978 ----
width = 1;
/* Compute height. */
! if ((prop = Fplist_get (plist, QCheight), !NILP (prop))
&& calc_pixel_width_or_height (&tem, it, prop, font, 0, 0))
{
height = (int)tem;
zero_height_ok_p = 1;
}
! else if (prop = Fplist_get (plist, QCrelative_height),
NUMVAL (prop) > 0)
height = FONT_HEIGHT (font) * NUMVAL (prop);
else
***************
*** 18984,18990 ****
/* Compute percentage of height used for ascent. If
`:ascent ASCENT' is present and valid, use that. Otherwise,
derive the ascent from the font in use. */
! if (prop = Fsafe_plist_get (plist, QCascent),
NUMVAL (prop) > 0 && NUMVAL (prop) <= 100)
ascent = height * NUMVAL (prop) / 100.0;
else if (!NILP (prop)
--- 18984,18990 ----
/* Compute percentage of height used for ascent. If
`:ascent ASCENT' is present and valid, use that. Otherwise,
derive the ascent from the font in use. */
! if (prop = Fplist_get (plist, QCascent),
NUMVAL (prop) > 0 && NUMVAL (prop) <= 100)
ascent = height * NUMVAL (prop) / 100.0;
else if (!NILP (prop)
***************
*** 21242,21248 ****
if (IMAGEP (object))
{
Lisp_Object image_map, hotspot;
! if ((image_map = Fsafe_plist_get (XCDR (object), QCmap),
!NILP (image_map))
&& (hotspot = find_hot_spot (image_map, dx, dy),
CONSP (hotspot))
--- 21242,21248 ----
if (IMAGEP (object))
{
Lisp_Object image_map, hotspot;
! if ((image_map = Fplist_get (XCDR (object), QCmap),
!NILP (image_map))
&& (hotspot = find_hot_spot (image_map, dx, dy),
CONSP (hotspot))
***************
*** 21258,21267 ****
if (CONSP (hotspot)
&& (plist = XCAR (hotspot), CONSP (plist)))
{
! pointer = Fsafe_plist_get (plist, Qpointer);
if (NILP (pointer))
pointer = Qhand;
! help = Fsafe_plist_get (plist, Qhelp_echo);
if (!NILP (help))
{
help_echo_string = help;
--- 21258,21267 ----
if (CONSP (hotspot)
&& (plist = XCAR (hotspot), CONSP (plist)))
{
! pointer = Fplist_get (plist, Qpointer);
if (NILP (pointer))
pointer = Qhand;
! help = Fplist_get (plist, Qhelp_echo);
if (!NILP (help))
{
help_echo_string = help;
***************
*** 21273,21279 ****
}
}
if (NILP (pointer))
! pointer = Fsafe_plist_get (XCDR (object), QCpointer);
}
if (STRINGP (string))
--- 21273,21279 ----
}
}
if (NILP (pointer))
! pointer = Fplist_get (XCDR (object), QCpointer);
}
if (STRINGP (string))
***************
*** 21426,21432 ****
if (img != NULL && IMAGEP (img->spec))
{
Lisp_Object image_map, hotspot;
! if ((image_map = Fsafe_plist_get (XCDR (img->spec), QCmap),
!NILP (image_map))
&& (hotspot = find_hot_spot (image_map,
glyph->slice.x + dx,
--- 21426,21432 ----
if (img != NULL && IMAGEP (img->spec))
{
Lisp_Object image_map, hotspot;
! if ((image_map = Fplist_get (XCDR (img->spec), QCmap),
!NILP (image_map))
&& (hotspot = find_hot_spot (image_map,
glyph->slice.x + dx,
***************
*** 21444,21453 ****
if (CONSP (hotspot)
&& (plist = XCAR (hotspot), CONSP (plist)))
{
! pointer = Fsafe_plist_get (plist, Qpointer);
if (NILP (pointer))
pointer = Qhand;
! help_echo_string = Fsafe_plist_get (plist, Qhelp_echo);
if (!NILP (help_echo_string))
{
help_echo_window = window;
--- 21444,21453 ----
if (CONSP (hotspot)
&& (plist = XCAR (hotspot), CONSP (plist)))
{
! pointer = Fplist_get (plist, Qpointer);
if (NILP (pointer))
pointer = Qhand;
! help_echo_string = Fplist_get (plist, Qhelp_echo);
if (!NILP (help_echo_string))
{
help_echo_window = window;
***************
*** 21457,21463 ****
}
}
if (NILP (pointer))
! pointer = Fsafe_plist_get (XCDR (img->spec), QCpointer);
}
}
--- 21457,21463 ----
}
}
if (NILP (pointer))
! pointer = Fplist_get (XCDR (img->spec), QCpointer);
}
}
- [Emacs-diffs] Changes to emacs/src/xdisp.c, Kim F . Storm, 2005/04/08
- [Emacs-diffs] Changes to emacs/src/xdisp.c, Richard M . Stallman, 2005/04/16
- [Emacs-diffs] Changes to emacs/src/xdisp.c, Kim F . Storm, 2005/04/18
- [Emacs-diffs] Changes to emacs/src/xdisp.c, Kim F . Storm, 2005/04/19
- [Emacs-diffs] Changes to emacs/src/xdisp.c, Kim F . Storm, 2005/04/19
- [Emacs-diffs] Changes to emacs/src/xdisp.c, Miles Bader, 2005/04/21
- [Emacs-diffs] Changes to emacs/src/xdisp.c,
Kim F . Storm <=