diff src/xdisp.c @ 83292:ad07ff6e4555

Merged from [e-mail]--gnu-2005 (patch 67, 270-278) Patches applied: * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-270 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-271 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-272 src/xdisp.c (dump_glyph_row): Don't display overlay_arrow_p field. * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-273 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-274 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-275 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-276 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-277 Merge from gnus--rel--5.10 * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-278 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-67 Update from CVS git-archimport-id: [e-mail]--2004/emacs--multi-tty--0--patch-332

--- a/src/xdisp.c	Mon Apr 25 11:47:55 2005 +0000
+++ b/src/xdisp.c	Mon Apr 25 11:49:38 2005 +0000
@@ -14156,10 +14156,10 @@
 {
   if (glyphs != 1)
     {
-      fprintf (stderr, "Row Start   End Used oEI><O\\CTZFesm     X    Y    W    H    V    A    P\n");
-      fprintf (stderr, "=======================================================================\n");
-
-      fprintf (stderr, "%3d %5d %5d %4d %1.1d%1.1d%1.1d%1.1d%1.1d\
+      fprintf (stderr, "Row Start   End Used oEI><\\CTZFesm     X    Y    W    H    V    A    P\n");
+      fprintf (stderr, "======================================================================\n");
+
+      fprintf (stderr, "%3d %5d %5d %4d %1.1d%1.1d%1.1d%1.1d\
 %1.1d%1.1d%1.1d%1.1d%1.1d%1.1d%1.1d%1.1d  %4d %4d %4d %4d %4d %4d %4d\n",
 	       vpos,
 	       MATRIX_ROW_START_CHARPOS (row),
@@ -14169,7 +14169,6 @@
 	       row->enabled_p,
 	       row->truncated_on_left_p,
 	       row->truncated_on_right_p,
-	       row->overlay_arrow_p,
 	       row->continued_p,
 	       MATRIX_ROW_CONTINUATION_LINE_P (row),
 	       row->displays_text_p,
@@ -16089,7 +16088,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;
@@ -16114,7 +16113,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
@@ -18917,14 +18916,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.
@@ -18948,7 +18947,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)
@@ -18968,13 +18967,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
@@ -18986,7 +18985,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)
@@ -21243,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))
@@ -21259,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;
@@ -21274,7 +21273,7 @@
 	    }
 	}
       if (NILP (pointer))
-	pointer = Fsafe_plist_get (XCDR (object), QCpointer);
+	pointer = Fplist_get (XCDR (object), QCpointer);
     }
 
   if (STRINGP (string))
@@ -21427,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,
@@ -21445,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;
@@ -21458,7 +21457,7 @@
 		    }
 		}
 	      if (NILP (pointer))
-		pointer = Fsafe_plist_get (XCDR (img->spec), QCpointer);
+		pointer = Fplist_get (XCDR (img->spec), QCpointer);
 	    }
 	}