X-Git-Url: http://git.hcoop.net/bpt/emacs.git/blobdiff_plain/eab3844f965646b62e242aa622754b86d1fd3444..671875dac181f7f1337f21d013a9c3d5f235ddf2:/src/xdisp.c

diff --git a/src/xdisp.c b/src/xdisp.c
index 63c2e5b814..6d3c142f62 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -3855,7 +3855,7 @@ display_prop_end (struct it *it, Lisp_Object object, struct text_pos start_pos)
 }
 
 
-/* Set up IT from a single `display' specification PROP.  OBJECT
+/* Set up IT from a single `display' property specification SPEC.  OBJECT
    is the object in which the `display' property was found.  *POSITION
    is the position at which it was found.  DISPLAY_REPLACED_P non-zero
    means that we previously saw a display specification which already
@@ -3865,7 +3865,7 @@ display_prop_end (struct it *it, Lisp_Object object, struct text_pos start_pos)
    OVERLAY is the overlay this `display' property came from,
    or nil if it was a text property.
 
-   If PROP is a `space' or `image' specification, and in some other
+   If SPEC is a `space' or `image' specification, and in some other
    cases too, set *POSITION to the position where the `display'
    property ends.
 
@@ -3875,7 +3875,7 @@ display_prop_end (struct it *it, Lisp_Object object, struct text_pos start_pos)
 static int
 handle_single_display_spec (struct it *it, Lisp_Object spec, Lisp_Object object,
 			    Lisp_Object overlay, struct text_pos *position,
-			    int display_replaced_before_p)
+			    int display_replaced_p)
 {
   Lisp_Object form;
   Lisp_Object location, value;
@@ -4171,7 +4171,7 @@ handle_single_display_spec (struct it *it, Lisp_Object spec, Lisp_Object object,
 #endif /* not HAVE_WINDOW_SYSTEM */
              || (CONSP (value) && EQ (XCAR (value), Qspace)));
 
-  if (valid_p && !display_replaced_before_p)
+  if (valid_p && !display_replaced_p)
     {
       /* Save current settings of IT so that we can restore them
 	 when we are finished with the glyph property value.  */
@@ -8373,22 +8373,10 @@ vmessage (const char *m, va_list ap)
 	{
 	  if (m)
 	    {
-	      char *buf = FRAME_MESSAGE_BUF (f);
-	      size_t bufsize = FRAME_MESSAGE_BUF_SIZE (f);
-	      int len;
+	      size_t len;
 
-	      memset (buf, 0, bufsize);
-	      len = vsnprintf (buf, bufsize, m, ap);
-
-	      /* Do any truncation at a character boundary.  */
-	      if (! (0 <= len && len < bufsize))
-		{
-		  char *end = memchr (buf, 0, bufsize);
-		  for (len = end ? end - buf : bufsize;
-		       len && ! CHAR_HEAD_P (buf[len - 1]);
-		       len--)
-		    continue;
-		}
+	      len = doprnt (FRAME_MESSAGE_BUF (f),
+			    FRAME_MESSAGE_BUF_SIZE (f), m, (char *)0, ap);
 
 	      message2 (FRAME_MESSAGE_BUF (f), len, 0);
 	    }
@@ -18136,7 +18124,7 @@ display_menu_bar (struct window *w)
 
   /* Display all items of the menu bar.  */
   items = FRAME_MENU_BAR_ITEMS (it.f);
-  for (i = 0; i < XVECTOR_SIZE (items); i += 4)
+  for (i = 0; i < ASIZE (items); i += 4)
     {
       Lisp_Object string;
 
@@ -26997,6 +26985,7 @@ init_xdisp (void)
 
   mini_w = XWINDOW (minibuf_window);
   root_window = FRAME_ROOT_WINDOW (XFRAME (WINDOW_FRAME (mini_w)));
+  echo_area_window = minibuf_window;
 
   if (!noninteractive)
     {