From: Gerd Moellmann <gerd@gnu.org>
Date: Fri, 12 Jan 2001 14:11:51 +0000 (+0000)
Subject: Fix last change.
X-Git-Tag: emacs-pretest-21.0.96~321
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4554cc799341b3d23310252de1f9d8464ce65791;p=emacs.git

Fix last change.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 025d96529f2..76e613598b0 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,12 @@
 2001-01-12  Gerd Moellmann  <gerd@gnu.org>
 
+	* xdisp.c (Fdump_tool_bar_row) [GLYPH_DEBUG]: Add parameters ROW
+	and GLYPHS.
+
+	* dispnew.c (update_text_area): Put code which decrements the
+	stop position when the row's face extends to the end of the
+	line in ,Ad(Bif 0.
+
 	* xfns.c (x_set_mouse_color): Fix color allocation.
 
 	* keyboard.c: Call get_local_map with new argument list.
@@ -35,7 +42,7 @@
 2001-01-10  Gerd Moellmann  <gerd@gnu.org>
 
 	* xdisp.c (display_line): On ttys, produce more than one
-	truncation glyph for multibyte characters that don't fit on the
+	truncation glyph for multi-column characters that don't fit on the
 	line.
 
 	* xselect.c (x_reply_selection_request): Add a comment.
diff --git a/src/dispnew.c b/src/dispnew.c
index 7bdfaa5cac6..dff5c91719d 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -4204,8 +4204,7 @@ update_text_area (w, vpos)
       /* If the desired row extends its face to the text area end,
 	 make sure we write at least one glyph, so that the face
 	 extension actually takes place.  */
-      if (MATRIX_ROW_EXTENDS_FACE_P (desired_row)
-	  && !w->pseudo_window_p)
+      if (MATRIX_ROW_EXTENDS_FACE_P (desired_row))
 	--desired_stop_pos;
 #endif