aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorjave2015-01-04 12:28:42 +0100
committerjave2015-01-04 12:28:42 +0100
commit9681f300de4dddb250770d18dc417ec0027beb94 (patch)
tree998a313f21b5c87fa00e888de9a08824e7650056 /src
parent78f196e333c9f77c6a6b5ed69b0d77857cd633a1 (diff)
downloademacs-9681f300de4dddb250770d18dc417ec0027beb94.tar.gz
emacs-9681f300de4dddb250770d18dc417ec0027beb94.zip
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.
Diffstat (limited to 'src')
-rw-r--r--src/xdisp.c2
1 files changed, 1 insertions, 1 deletions
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)
7690 case GET_FROM_STRETCH: 7690 case GET_FROM_STRETCH:
7691#ifdef HAVE_XWIDGETS 7691#ifdef HAVE_XWIDGETS
7692 case GET_FROM_XWIDGET: 7692 case GET_FROM_XWIDGET:
7693#endif
7693 7694
7694 /* The position etc with which we have to proceed are on 7695 /* The position etc with which we have to proceed are on
7695 the stack. The position may be at the end of a string, 7696 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)
7699 if (it->method == GET_FROM_STRING) 7700 if (it->method == GET_FROM_STRING)
7700 goto consider_string_end; 7701 goto consider_string_end;
7701 break; 7702 break;
7702#endif
7703 7703
7704 default: 7704 default:
7705 /* There are no other methods defined, so this should be a bug. */ 7705 /* There are no other methods defined, so this should be a bug. */