From: Eli Zaretskii <eliz@gnu.org>
Date: Wed, 18 Sep 2013 16:20:37 +0000 (+0300)
Subject: No need to pay attention to window margins.
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~1328^2~43
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=42a1ea04113c71d69acc316919b57e335290832d;p=emacs.git

No need to pay attention to window margins.
---

diff --git a/src/xdisp.c b/src/xdisp.c
index b2e60549fcd..4e0709c59d7 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -20656,17 +20656,13 @@ display_tty_menu_item (const char *item_text, int width, int face_id,
   row->reversed_p = 0;
   row->enabled_p = 1;
 
-  /* We can only write over TEXT_AREA, as display_string cannot do
-     display margins.  */
-  x += row->used[LEFT_MARGIN_AREA];
-
   /* Arrange for the menu item glyphs to start at (X,Y) and have the
      desired face.  */
   it.current_x = it.hpos = x;
   it.current_y = it.vpos = y;
   saved_used = row->used[TEXT_AREA];
   saved_truncated = row->truncated_on_right_p;
-  row->used[TEXT_AREA] = x - row->used[LEFT_MARGIN_AREA];
+  row->used[TEXT_AREA] = x;
   it.face_id = face_id;
   it.line_wrap = TRUNCATE;
 
@@ -20694,7 +20690,7 @@ display_tty_menu_item (const char *item_text, int width, int face_id,
     display_string (item_text, Qnil, Qnil, 0, 0, &it,
 		    width, 0, FRAME_COLS (f) - 1, -1);
 
-  row->used[TEXT_AREA] = saved_used;
+  row->used[TEXT_AREA] = max (saved_used, row->used[TEXT_AREA]);
   row->truncated_on_right_p = saved_truncated;
   row->hash = row_hash (row);
   row->full_width_p = saved_width;