Mercurial > emacs
diff src/xdisp.c @ 61725:f0d1759ab128
(store_mode_line_string, produce_stretch_glyph)
(note_mode_line_or_margin_highlight, note_mouse_highlight):
Use Fplist_get instead of Fsafe_plist_get.
author | Kim F. Storm <storm@cua.dk> |
---|---|
date | Thu, 21 Apr 2005 23:45:28 +0000 |
parents | 1f917e46c345 |
children | b3a3357502cd ad07ff6e4555 |
line wrap: on
line diff
--- a/src/xdisp.c Thu Apr 21 23:45:10 2005 +0000 +++ b/src/xdisp.c Thu Apr 21 23:45:28 2005 +0000 @@ -16087,7 +16087,7 @@ props = mode_line_string_face_prop; else if (!NILP (mode_line_string_face)) { - Lisp_Object face = Fsafe_plist_get (props, Qface); + Lisp_Object face = Fplist_get (props, Qface); props = Fcopy_sequence (props); if (NILP (face)) face = mode_line_string_face; @@ -16112,7 +16112,7 @@ Lisp_Object face; if (NILP (props)) props = Ftext_properties_at (make_number (0), lisp_string); - face = Fsafe_plist_get (props, Qface); + face = Fplist_get (props, Qface); if (NILP (face)) face = mode_line_string_face; else @@ -18915,14 +18915,14 @@ plist = XCDR (it->object); /* Compute the width of the stretch. */ - if ((prop = Fsafe_plist_get (plist, QCwidth), !NILP (prop)) + 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 = Fsafe_plist_get (plist, QCrelative_width), + else if (prop = Fplist_get (plist, QCrelative_width), NUMVAL (prop) > 0) { /* Relative width `:relative-width FACTOR' specified and valid. @@ -18946,7 +18946,7 @@ x_produce_glyphs (&it2); width = NUMVAL (prop) * it2.pixel_width; } - else if ((prop = Fsafe_plist_get (plist, QCalign_to), !NILP (prop)) + 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,13 +18966,13 @@ width = 1; /* Compute height. */ - if ((prop = Fsafe_plist_get (plist, QCheight), !NILP (prop)) + 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 = Fsafe_plist_get (plist, QCrelative_height), + else if (prop = Fplist_get (plist, QCrelative_height), NUMVAL (prop) > 0) height = FONT_HEIGHT (font) * NUMVAL (prop); else @@ -18984,7 +18984,7 @@ /* 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), + if (prop = Fplist_get (plist, QCascent), NUMVAL (prop) > 0 && NUMVAL (prop) <= 100) ascent = height * NUMVAL (prop) / 100.0; else if (!NILP (prop) @@ -21242,7 +21242,7 @@ if (IMAGEP (object)) { Lisp_Object image_map, hotspot; - if ((image_map = Fsafe_plist_get (XCDR (object), QCmap), + if ((image_map = Fplist_get (XCDR (object), QCmap), !NILP (image_map)) && (hotspot = find_hot_spot (image_map, dx, dy), CONSP (hotspot)) @@ -21258,10 +21258,10 @@ if (CONSP (hotspot) && (plist = XCAR (hotspot), CONSP (plist))) { - pointer = Fsafe_plist_get (plist, Qpointer); + pointer = Fplist_get (plist, Qpointer); if (NILP (pointer)) pointer = Qhand; - help = Fsafe_plist_get (plist, Qhelp_echo); + help = Fplist_get (plist, Qhelp_echo); if (!NILP (help)) { help_echo_string = help; @@ -21273,7 +21273,7 @@ } } if (NILP (pointer)) - pointer = Fsafe_plist_get (XCDR (object), QCpointer); + pointer = Fplist_get (XCDR (object), QCpointer); } if (STRINGP (string)) @@ -21426,7 +21426,7 @@ if (img != NULL && IMAGEP (img->spec)) { Lisp_Object image_map, hotspot; - if ((image_map = Fsafe_plist_get (XCDR (img->spec), QCmap), + if ((image_map = Fplist_get (XCDR (img->spec), QCmap), !NILP (image_map)) && (hotspot = find_hot_spot (image_map, glyph->slice.x + dx, @@ -21444,10 +21444,10 @@ if (CONSP (hotspot) && (plist = XCAR (hotspot), CONSP (plist))) { - pointer = Fsafe_plist_get (plist, Qpointer); + pointer = Fplist_get (plist, Qpointer); if (NILP (pointer)) pointer = Qhand; - help_echo_string = Fsafe_plist_get (plist, Qhelp_echo); + help_echo_string = Fplist_get (plist, Qhelp_echo); if (!NILP (help_echo_string)) { help_echo_window = window; @@ -21457,7 +21457,7 @@ } } if (NILP (pointer)) - pointer = Fsafe_plist_get (XCDR (img->spec), QCpointer); + pointer = Fplist_get (XCDR (img->spec), QCpointer); } }