From: Robin Templeton <robin@terpri.org>
Date: Fri, 18 Jul 2014 19:07:36 +0000 (-0400)
Subject: dynwind fixes
X-Git-Url: https://git.hcoop.net/bpt/emacs.git/commitdiff_plain/fa8678ebb05c28c54f114727a0bec7453903dbf0

dynwind fixes
---

diff --git a/src/xdisp.c b/src/xdisp.c
index c9ce9b9b0d..774903b6bc 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -15775,7 +15775,6 @@ redisplay_window (Lisp_Object window, bool just_this_one_p)
      It indicates that the buffer contents and narrowing are unchanged.  */
   bool buffer_unchanged_p = false;
   int temp_scroll_step = 0;
-  dynwind_begin ();
   int rc;
   int centering_position = -1;
   int last_line_misfit = 0;
@@ -15801,6 +15800,8 @@ redisplay_window (Lisp_Object window, bool just_this_one_p)
   eassert (XMARKER (w->start)->buffer == buffer);
   eassert (XMARKER (w->pointm)->buffer == buffer);
 
+  dynwind_begin ();
+
   /* We come here again if we need to run window-text-change-functions
      below.  */
  restart: