emacs: src/xdisp.c comparison

comparison 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

comparison

equal deleted inserted replaced

-:4a9b51620642
+:f0d1759ab128
 lisp_string = make_string (string, len);
 if (NILP (props))
 	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;
 	  else
 	    face = Fcons (face, Fcons (mode_line_string_face, Qnil));
 if (!NILP (mode_line_string_face))
 	{
 	  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
 	    face = Fcons (face, Fcons (mode_line_string_face, Qnil));
 	  props = Fcons (Qface, Fcons (face, Qnil));
 /* List should start with `space'.  */
 xassert (CONSP (it->object) && EQ (XCAR (it->object), Qspace));
 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.
 	 Compute the width of the characters having the `glyph'
 	 property.  */
 it2.glyph_row = NULL;
 it2.what = IT_CHARACTER;
 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)
 	align_to = (align_to < 0
 		    ? 0
 if (width <= 0 && (width < 0 || !zero_width_ok_p))
 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
 height = FONT_HEIGHT (font);
 height = 1;
 /* 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)
 	   && calc_pixel_width_or_height (&tem, it, prop, font, 0, 0))
 ascent = min (max (0, (int)tem), height);
 help = Qnil;
 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))
 	  && (hotspot = XCDR (hotspot), CONSP (hotspot)))
 	{
 	     properties in PLIST (and do something...).  */
 	  hotspot = XCDR (hotspot);
 	  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;
 		  /* Is this correct?  ++kfs */
 		  XSETWINDOW (help_echo_window, w);
 		  help_echo_pos = charpos;
 		}
 	    }
 	}
 if (NILP (pointer))
-	pointer = Fsafe_plist_get (XCDR (object), QCpointer);
+	pointer = Fplist_get (XCDR (object), QCpointer);
 }
 if (STRINGP (string))
 {
 pos = make_number (charpos);
 	{
 	  struct image *img = IMAGE_FROM_ID (f, glyph->u.img_id);
 	  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,
 					       glyph->slice.y + dy),
 		      CONSP (hotspot))
 		     properties in PLIST (and do something...).  */
 		  hotspot = XCDR (hotspot);
 		  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;
 			  help_echo_object = glyph->object;
 			  help_echo_pos = glyph->charpos;
 			}
 		    }
 		}
 	      if (NILP (pointer))
-		pointer = Fsafe_plist_get (XCDR (img->spec), QCpointer);
+		pointer = Fplist_get (XCDR (img->spec), QCpointer);
 	    }
 	}
 /* Clear mouse face if X/Y not over text.  */
 if (glyph == NULL

Mercurial > emacs

comparison src/xdisp.c @ 61725:f0d1759ab128