(try_window_id): Avoid starting to display in the moddle

of a character, a TAB for instance.  This is easier than to set
up the iterator exactly, and it's not a frequent case, so the
additional effort wouldn't really pay off.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 755b7ca1301bb85ab0bf1bba8555510946713abb..d4bfd1c0fafc174ac88def81d3dce988cb111281 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2000-11-27  Gerd Moellmann  <gerd@gnu.org>
+
+       * toolbar/tool-bar.el (tool-bar-add-item-from-menu): Handle case
+       that foreground and/or background colors of the face `tool-bar'
+       are unspecified.
+
 2000-11-27  Miles Bader  <miles@gnu.org>
 
        * wid-edit.el (widget-field-buffer, widget-field-start) 

diff --git a/src/ChangeLog b/src/ChangeLog
index 971bd2bc047ec93d7351253f60618f51c2c5111e..909cce3e2a8aef27b2a5baf3607d43ef5a8403ba 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,6 +1,13 @@
+2000-11-27  Gerd Moellmann  <gerd@gnu.org>
+
+       * xdisp.c (try_window_id): Avoid starting to display in the moddle
+        of a character, a TAB for instance.  This is easier than to set
+        up the iterator exactly, and it's not a frequent case, so the
+        additional effort wouldn't really pay off.
+
 2000-11-26  Andrew Choi  <akochoi@i-cable.com>
 
-       * emacs.c (main) [macintosh]: call syms_of_frame before calling
+       * emacs.c (main) [macintosh]: Call syms_of_frame before calling
        init_window_once.
 
 2000-11-25  Jason Rumney  <jasonr@gnu.org>

diff --git a/src/xdisp.c b/src/xdisp.c
index 6cec77609265a11677fff61ddf9b4d8920fce642..16ac7dba3183ca6fc7c3dea8acb5bbae1195df1f 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -10767,6 +10767,17 @@ try_window_id (w)
   last_unchanged_at_beg_row = find_last_unchanged_at_beg_row (w);
   if (last_unchanged_at_beg_row)
     {
+      /* Avoid starting to display in the moddle of a character, a TAB
+        for instance.  This is easier than to set up the iterator
+        exactly, and it's not a frequent case, so the additional
+        effort wouldn't really pay off.  */
+      while (MATRIX_ROW_ENDS_IN_MIDDLE_OF_CHAR_P (last_unchanged_at_beg_row)
+            && last_unchanged_at_beg_row > w->current_matrix->rows)
+       --last_unchanged_at_beg_row;
+
+      if (MATRIX_ROW_ENDS_IN_MIDDLE_OF_CHAR_P (last_unchanged_at_beg_row))
+       return 0;
+      
       init_to_row_end (&it, w, last_unchanged_at_beg_row);
       start_pos = it.current.pos;