aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGerd Moellmann2001-01-12 14:11:51 +0000
committerGerd Moellmann2001-01-12 14:11:51 +0000
commit4554cc799341b3d23310252de1f9d8464ce65791 (patch)
tree4179bf5cb7b38966444c997afd8d12ef3d06f05f /src
parent074b781a4cc7961c2d49389aeb2ea143d53d6139 (diff)
downloademacs-4554cc799341b3d23310252de1f9d8464ce65791.tar.gz
emacs-4554cc799341b3d23310252de1f9d8464ce65791.zip
Fix last change.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog9
-rw-r--r--src/dispnew.c3
2 files changed, 9 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 025d96529f2..76e613598b0 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,12 @@
12001-01-12 Gerd Moellmann <gerd@gnu.org> 12001-01-12 Gerd Moellmann <gerd@gnu.org>
2 2
3 * xdisp.c (Fdump_tool_bar_row) [GLYPH_DEBUG]: Add parameters ROW
4 and GLYPHS.
5
6 * dispnew.c (update_text_area): Put code which decrements the
7 stop position when the row's face extends to the end of the
8 line in ,Ad(Bif 0.
9
3 * xfns.c (x_set_mouse_color): Fix color allocation. 10 * xfns.c (x_set_mouse_color): Fix color allocation.
4 11
5 * keyboard.c: Call get_local_map with new argument list. 12 * keyboard.c: Call get_local_map with new argument list.
@@ -35,7 +42,7 @@
352001-01-10 Gerd Moellmann <gerd@gnu.org> 422001-01-10 Gerd Moellmann <gerd@gnu.org>
36 43
37 * xdisp.c (display_line): On ttys, produce more than one 44 * xdisp.c (display_line): On ttys, produce more than one
38 truncation glyph for multibyte characters that don't fit on the 45 truncation glyph for multi-column characters that don't fit on the
39 line. 46 line.
40 47
41 * xselect.c (x_reply_selection_request): Add a comment. 48 * 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)
4204 /* If the desired row extends its face to the text area end, 4204 /* If the desired row extends its face to the text area end,
4205 make sure we write at least one glyph, so that the face 4205 make sure we write at least one glyph, so that the face
4206 extension actually takes place. */ 4206 extension actually takes place. */
4207 if (MATRIX_ROW_EXTENDS_FACE_P (desired_row) 4207 if (MATRIX_ROW_EXTENDS_FACE_P (desired_row))
4208 && !w->pseudo_window_p)
4209 --desired_stop_pos; 4208 --desired_stop_pos;
4210#endif 4209#endif
4211 4210