From: jave <joakim@verona.se>
Date: Sun, 4 Jan 2015 11:28:42 +0000 (+0100)
Subject: Fixed over-eager ifdef
X-Git-Tag: emacs-25.0.90~2609
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9681f300de4dddb250770d18dc417ec0027beb94;p=emacs.git

Fixed over-eager ifdef

An xwidget ifdef in xdisp.c ended too late, so non xwidget code got
ifdefed away unexpectedly. Should fix a crash.
---

diff --git a/src/xdisp.c b/src/xdisp.c
index dd474cf094e..bd6ab628d43 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -7690,6 +7690,7 @@ set_iterator_to_next (struct it *it, int reseat_p)
     case GET_FROM_STRETCH:
 #ifdef HAVE_XWIDGETS
     case GET_FROM_XWIDGET:
+#endif
 
       /* The position etc with which we have to proceed are on
 	 the stack.  The position may be at the end of a string,
@@ -7699,7 +7700,6 @@ set_iterator_to_next (struct it *it, int reseat_p)
       if (it->method == GET_FROM_STRING)
 	goto consider_string_end;
       break;
-#endif
 
     default:
       /* There are no other methods defined, so this should be a bug.  */