Merge from emacs-24

2 files changed, 25 insertions, 12 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index f00caa30733..075e41f9bd1 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2014-10-21  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * xdisp.c (redisplay_window): Re-run pre-redisplay-function after we
+        move point.
+
 2014-10-20  Glenn Morris  <rgm@gnu.org>
 
         * Merge in all changes up to 24.4 release.
@@ -43,11 +48,11 @@
         * gtkutil.c (XG_TEXT_CANCEL, XG_TEXT_OPEN, XG_TEXT_OK): New defines
         to handle Gtk versions.
         (xg_get_file_with_chooser): Use them.
-        (xg_have_tear_offs, tearoff_remove, tearoff_activate): Remove
-        (create_menus): Remove teroff argument and code.
+        (xg_have_tear_offs, tearoff_remove, tearoff_activate):
+        Remove (create_menus): Remove teroff argument and code.
         Remove call to gtk_menu_set_title.
-        (xg_update_menubar, xg_update_submenu): Remove tearoff code.  Adjust
-        args to create_menus.
+        (xg_update_menubar, xg_update_submenu): Remove tearoff code.
+        Adjust args to create_menus.
         (xg_tool_bar_menu_proxy, xg_tool_bar_detach_callback)
         (xg_tool_bar_attach_callback, TOOLBAR_TOP_WIDGET): Remove.
         (xg_pack_tool_bar): Replace TOOLBAR_TOP_WIDGET, remove detach code.
@@ -58,8 +63,8 @@
         find_icon_from_name.  Let stock be a list of icon names to try.
         Only use gtk_image_new_from_stock on Gtk+ < 3.10.
         Replace TOOLBAR_TOP_WIDGET.
-        (free_frame_tool_bar, xg_change_toolbar_position ): Replace
-        TOOLBAR_TOP_WIDGET.
+        (free_frame_tool_bar, xg_change_toolbar_position ):
+        Replace TOOLBAR_TOP_WIDGET.
         (xg_initialize): Remove tearoff code.
 
 2014-10-18  Eli Zaretskii  <eliz@gnu.org>
diff --git a/src/xdisp.c b/src/xdisp.c
index ad28dacf4e5..dca6631a6ff 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -16345,16 +16345,24 @@ redisplay_window (Lisp_Object window, bool just_this_one_p)
 
           set_cursor_from_row (w, row, w->desired_matrix, 0, 0, 0, 0);
 
-          /* If we are highlighting the region, then we just changed
-             the region, so redisplay to show it.  */
-          /* FIXME: We need to (re)run pre-redisplay-function!  */
-          /* if (markpos_of_region () >= 0)
-            {
+          /* Re-run pre-redisplay-function so it can update the region
+             according to the new position of point.  */
+          /* Other than the cursor, w's redisplay is done so we can set its
+             redisplay to false.  Also the buffer's redisplay can be set to
+             false, since propagate_buffer_redisplay should have already
+             propagated its info to `w' anyway.  */
+          w->redisplay = false;
+          XBUFFER (w->contents)->text->redisplay = false;
+          safe__call1 (true, Vpre_redisplay_function, Fcons (window, Qnil));
+
+          if (w->redisplay || XBUFFER (w->contents)->text->redisplay)
+            {
+              /* pre-redisplay-function made changes (e.g. move the region)
+                 that require another round of redisplay.  */
               clear_glyph_matrix (w->desired_matrix);
               if (!try_window (window, startp, 0))
                 goto need_larger_matrices;
             }
-          */
         }
       if (w->cursor.vpos < 0 || !cursor_row_fully_visible_p (w, 0, 0))
         {