[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] xwidget 9681f30 2/2: Fixed over-eager ifdef
From: |
Joakim Verona |
Subject: |
[Emacs-diffs] xwidget 9681f30 2/2: Fixed over-eager ifdef |
Date: |
Sun, 04 Jan 2015 14:10:52 +0000 |
branch: xwidget
commit 9681f300de4dddb250770d18dc417ec0027beb94
Author: jave <address@hidden>
Commit: jave <address@hidden>
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.
---
src/xdisp.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/xdisp.c b/src/xdisp.c
index dd474cf..bd6ab62 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. */