7 files changed, 53 insertions, 6 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 3dbddc9b215..15281f47438 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,33 @@
+2011-09-15  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * editfns.c (Fformat): Fix bug in text-property fix (Bug#9514).
+        Don't mishandle (length (format "%%")) and (format "%4000s%%" "").
+
+2011-09-15  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * editfns.c (Fformat): Correctly handle text properties on "%%".
+
+2011-09-15  Eli Zaretskii  <eliz@gnu.org>
+
+        * xterm.c (x_draw_composite_glyph_string_foreground):
+        * w32term.c (x_draw_composite_glyph_string_foreground):
+        * term.c (encode_terminal_code):
+        * composite.c (composition_update_it, get_composition_id):
+        * xdisp.c (get_next_display_element)
+        (fill_composite_glyph_string): Add comments about special meaning
+        of TAB characters in a composition.
+
+2011-09-15  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * editfns.c (Fformat): Fix off-by-1 bug for "%%b" (Bug#9514).
+        This occurs when processing a multibyte format.
+        Problem reported by Wolfgang Jenker.
+
+2011-09-15  Johan Bockgård  <bojohan@gnu.org>
+
+        * xdisp.c (try_cursor_movement): Only check for exact match if
+        cursor hpos found by set_cursor_from_row is valid.  (Bug#9495)
+
 2011-09-14  Paul Eggert  <eggert@cs.ucla.edu>
 
         Remove unused external symbols.
diff --git a/src/composite.c b/src/composite.c
index 2a3fbe29552..c8e4dd082ae 100644
--- a/src/composite.c
+++ b/src/composite.c
@@ -345,6 +345,8 @@ get_composition_id (EMACS_INT charpos, EMACS_INT bytepos, EMACS_INT nchars,
         {
           int this_width;
           ch = XINT (key_contents[i]);
+          /* TAB in a composition means display glyphs with padding
+             space on the left or right.  */
           this_width = (ch == '\t' ? 1 : CHAR_WIDTH (ch));
           if (cmp->width < this_width)
             cmp->width = this_width;
@@ -1384,6 +1386,8 @@ composition_update_it (struct composition_it *cmp_it, EMACS_INT charpos, EMACS_I
       else
         {
           for (i = 0; i < cmp->glyph_len; i++)
+            /* TAB in a composition means display glyphs with padding
+               space on the left or right.  */
             if ((c = COMPOSITION_GLYPH (cmp, i)) != '\t')
               break;
           if (c == '\t')
diff --git a/src/editfns.c b/src/editfns.c
index 596765d899e..3dd58377ada 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -4137,8 +4137,8 @@ usage: (format STRING &rest OBJECTS)  */)
                 format++;
               while (! CHAR_HEAD_P (*format));
 
-              convbytes = format - format0;
-              memset (&discarded[format0 + 1 - format_start], 2, convbytes - 1);
+              convbytes = format - src;
+              memset (&discarded[src + 1 - format_start], 2, convbytes - 1);
             }
           else
             {
diff --git a/src/term.c b/src/term.c
index 10416090b80..4a671d048c4 100644
--- a/src/term.c
+++ b/src/term.c
@@ -574,6 +574,8 @@ encode_terminal_code (struct glyph *src, int src_len, struct coding_system *codi
               {
                 int c = COMPOSITION_GLYPH (cmp, i);
 
+                /* TAB in a composition means display glyphs with
+                   padding space on the left or right.  */
                 if (c == '\t')
                   continue;
                 if (char_charset (c, charset_list, NULL))
diff --git a/src/w32term.c b/src/w32term.c
index 8d9d8f72029..39f1e245e18 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -1294,6 +1294,8 @@ x_draw_composite_glyph_string_foreground (struct glyph_string *s)
       old_font = SelectObject (s->hdc, FONT_HANDLE (font));
 
       for (i = 0, j = s->cmp_from; i < s->nchars; i++, j++)
+        /* TAB in a composition means display glyphs with padding
+           space on the left or right.  */
         if (COMPOSITION_GLYPH (s->cmp, j) != '\t')
           {
             int xx = x + s->cmp->offsets[j * 2];
diff --git a/src/xdisp.c b/src/xdisp.c
index 32007f52f4d..ddbbcbb1278 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -6479,6 +6479,8 @@ get_next_display_element (struct it *it)
 
               c = ' ';
               for (i = 0; i < cmp->glyph_len; i++)
+                /* TAB in a composition means display glyphs with
+                   padding space on the left or right.  */
                 if ((c = COMPOSITION_GLYPH (cmp, i)) != '\t')
                   break;
             }
@@ -11970,9 +11972,9 @@ hscroll_window_tree (Lisp_Object window)
                 }
               hscroll = max (hscroll, XFASTINT (w->min_hscroll));
 
-              /* Don't call Fset_window_hscroll if value hasn't
-                 changed because it will prevent redisplay
-                 optimizations.  */
+              /* Don't prevent redisplay optimizations if hscroll
+                 hasn't changed, as it will unnecessarily slow down
+                 redisplay.  */
               if (XFASTINT (w->hscroll) != hscroll)
                 {
                   XBUFFER (w->buffer)->prevent_redisplay_optimizations_p = 1;
@@ -14688,7 +14690,10 @@ try_cursor_movement (Lisp_Object window, struct text_pos startp, int *scroll_ste
                      is set, we are done.  */
                   at_zv_p =
                     MATRIX_ROW (w->current_matrix, w->cursor.vpos)->ends_at_zv_p;
-                  if (!at_zv_p)
+                  if (rv && !at_zv_p
+                      && w->cursor.hpos >= 0
+                      && w->cursor.hpos < MATRIX_ROW_USED (w->current_matrix,
+                                                           w->cursor.vpos))
                     {
                       struct glyph_row *candidate =
                         MATRIX_ROW (w->current_matrix, w->cursor.vpos);
@@ -21835,6 +21840,8 @@ fill_composite_glyph_string (struct glyph_string *s, struct face *base_face,
     {
       int c = COMPOSITION_GLYPH (s->cmp, i);
 
+      /* TAB in a composition means display glyphs with padding space
+         on the left or right.  */
       if (c != '\t')
         {
           int face_id = FACE_FOR_CHAR (s->f, base_face->ascii_face, c,
diff --git a/src/xterm.c b/src/xterm.c
index 0c096e8f729..1357afa0c15 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -1309,6 +1309,8 @@ x_draw_composite_glyph_string_foreground (struct glyph_string *s)
       int y = s->ybase;
 
       for (i = 0, j = s->cmp_from; i < s->nchars; i++, j++)
+        /* TAB in a composition means display glyphs with padding
+           space on the left or right.  */
         if (COMPOSITION_GLYPH (s->cmp, j) != '\t')
           {
             int xx = x + s->cmp->offsets[j * 2];