[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: |
Mon, 15 Nov 2004 10:35:20 -0500 |
Index: emacs/src/xdisp.c
diff -c emacs/src/xdisp.c:1.932 emacs/src/xdisp.c:1.933
*** emacs/src/xdisp.c:1.932 Mon Nov 15 13:34:18 2004
--- emacs/src/xdisp.c Mon Nov 15 15:21:34 2004
***************
*** 15818,15824 ****
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;
--- 15818,15824 ----
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;
***************
*** 15843,15849 ****
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
--- 15843,15849 ----
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
***************
*** 18624,18637 ****
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.
--- 18624,18637 ----
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.
***************
*** 18655,18661 ****
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)
--- 18655,18661 ----
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)
***************
*** 18675,18687 ****
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
--- 18675,18687 ----
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
***************
*** 18693,18699 ****
/* 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)
--- 18693,18699 ----
/* 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)
***************
*** 20897,20903 ****
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))
--- 20897,20903 ----
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))
***************
*** 20909,20920 ****
/* Could check AREA_ID to see if we enter/leave this hot-spot.
If so, we could look for mouse-enter, mouse-leave
properties in PLIST (and do something...). */
! if ((plist = XCDR (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;
--- 20909,20922 ----
/* Could check AREA_ID to see if we enter/leave this hot-spot.
If so, we could look for mouse-enter, mouse-leave
properties in PLIST (and do something...). */
! hotspot = XCDR (hotspot);
! 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;
***************
*** 20925,20931 ****
}
}
if (NILP (pointer))
! pointer = Fplist_get (XCDR (object), QCpointer);
}
}
--- 20927,20933 ----
}
}
if (NILP (pointer))
! pointer = Fsafe_plist_get (XCDR (object), QCpointer);
}
}
***************
*** 21076,21082 ****
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,
--- 21078,21084 ----
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,
***************
*** 21090,21101 ****
/* Could check AREA_ID to see if we enter/leave this hot-spot.
If so, we could look for mouse-enter, mouse-leave
properties in PLIST (and do something...). */
! if ((plist = XCDR (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;
--- 21092,21105 ----
/* Could check AREA_ID to see if we enter/leave this hot-spot.
If so, we could look for mouse-enter, mouse-leave
properties in PLIST (and do something...). */
! hotspot = XCDR (hotspot);
! 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;
***************
*** 21105,21111 ****
}
}
if (NILP (pointer))
! pointer = Fplist_get (XCDR (img->spec), QCpointer);
}
}
--- 21109,21115 ----
}
}
if (NILP (pointer))
! pointer = Fsafe_plist_get (XCDR (img->spec), QCpointer);
}
}
- [Emacs-diffs] Changes to emacs/src/xdisp.c, Richard M . Stallman, 2004/11/02
- [Emacs-diffs] Changes to emacs/src/xdisp.c, Kim F . Storm, 2004/11/08
- [Emacs-diffs] Changes to emacs/src/xdisp.c, Kim F . Storm, 2004/11/08
- [Emacs-diffs] Changes to emacs/src/xdisp.c, Kim F . Storm, 2004/11/09
- [Emacs-diffs] Changes to emacs/src/xdisp.c, Kim F . Storm, 2004/11/12
- [Emacs-diffs] Changes to emacs/src/xdisp.c, Kim F . Storm, 2004/11/12
- [Emacs-diffs] Changes to emacs/src/xdisp.c, Richard M . Stallman, 2004/11/13
- [Emacs-diffs] Changes to emacs/src/xdisp.c, Richard M . Stallman, 2004/11/15
- [Emacs-diffs] Changes to emacs/src/xdisp.c,
Kim F . Storm <=
- [Emacs-diffs] Changes to emacs/src/xdisp.c, Kenichi Handa, 2004/11/15
- [Emacs-diffs] Changes to emacs/src/xdisp.c, Stefan Monnier, 2004/11/16
- [Emacs-diffs] Changes to emacs/src/xdisp.c, Kim F . Storm, 2004/11/16
- [Emacs-diffs] Changes to emacs/src/xdisp.c, Luc Teirlinck, 2004/11/16
- [Emacs-diffs] Changes to emacs/src/xdisp.c, Kim F . Storm, 2004/11/18
- [Emacs-diffs] Changes to emacs/src/xdisp.c, Kim F . Storm, 2004/11/21
- [Emacs-diffs] Changes to emacs/src/xdisp.c, Kim F . Storm, 2004/11/21
- [Emacs-diffs] Changes to emacs/src/xdisp.c, Kim F . Storm, 2004/11/21
- [Emacs-diffs] Changes to emacs/src/xdisp.c, Kim F . Storm, 2004/11/22
- [Emacs-diffs] Changes to emacs/src/xdisp.c, Kim F . Storm, 2004/11/24