Merge from origin/emacs-24

ec26c23 authors.el: Add missing ignored and renamed files
e589765 A more thorough fix for bug#19307
4e8d586 Fix last commit
d6fee01 Tramp: Don't use a tempfile for ControlPath.
27e11c0 Fix display of overlay strings with faces after ellipsis  (Bug#19307)
e9a7e10 Fix redrawing of mode lines when exposed  (Bug#19721)
50f3811 net/tramp.el (tramp-ssh-controlmaster-options): Use "%C"

Conflicts:
	lisp/ChangeLog
	src/ChangeLog
	src/xdisp.c

1 files changed, 27 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 0bc5d650caf..0a05b544d98 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,30 @@
+2015-03-03  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (handle_stop, handle_single_display_spec)
+        (next-element_from_image): Don't reset the
+        ignore_overlay_strings_at_pos_p flag here.
+        (next_element_from_buffer): Reset ignore_overlay_strings_at_pos_p
+        here.
+        (next_overlay_string): Set ignore_overlay_strings_at_pos_p here,
+        after we've exhausted all the overlay strings at the current
+        position.  (Bug#19307)
+
+2015-03-03  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (set_iterator_to_next): Set value of stop_charpos
+        according to the object we are about to resume iterating.
+        (Bug#19307)
+
+        * dispnew.c (adjust_glyph_matrix): Set the update_mode_line flag
+        of the window whose current glyph matrix was resized, which
+        disables the mode-line row as side effect.
+
+        * xdisp.c (redisplay_window): Don't avoid redisplay of a window
+        whose update_mode_line flag is set.  (Bug#19721)
+
+2015-03-03  Eli Zaretskii  <eliz@gnu.org>
+
+        * dispextern.h (FACE_FOR_CHAR): Fix the commentary.
 2015-03-03  Daniel Colascione  <dancol@dancol.org>
 
         * alloc.c (syms_of_alloc): Rename `gc-precise-p' to `gc-precise'.