Fix rendering of composed caharacters on the mode line. (Bug#19435)

 src/xdisp.c (set_iterator_to_next) <GET_FROM_STRING>: Limit search in
 composition_compute_stop_pos to the number of characters in the
 string.
 <GET_FROM_BUFFER, GET_FROM_STRING>: Simplify code.
 src/composite.c (composition_compute_stop_pos): If no composition
 was found in a string before ENDPOS, and ENDPOS is the string end,
 no need to back up to a safe point.
 src/dispextern.h (struct it) <end_charpos>: Improve commentary.

1 files changed, 2 insertions, 1 deletions

diff --git a/src/composite.c b/src/composite.c
index fa882141908..a1282103972 100644
--- a/src/composite.c
+++ b/src/composite.c
@@ -1036,7 +1036,8 @@ composition_compute_stop_pos (struct composition_it *cmp_it, ptrdiff_t charpos,
                 }
             }
         }
-      if (charpos == endpos)
+      if (charpos == endpos
+          && !(STRINGP (string) && endpos == SCHARS (string)))
         {
           /* We couldn't find a composition point before ENDPOS.  But,
              some character after ENDPOS may be composed with