* src/eval.c (Fsignal): Fix `debug' handling to match 2013-10-03 change.

src/ChangeLog

+2014-01-25  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* eval.c (Fsignal): Fix `debug' handling to match 2013-10-03 change.
+
 2014-01-24  Paul Eggert  <eggert@cs.ucla.edu>
 
 	Fix bool-vector-count-population bug on MinGW64 (Bug#16535).

src/eval.c

@@ -1533,8 +1533,8 @@ See also the function `condition-case'.  */)
 	  || NILP (clause)
 	  /* A `debug' symbol in the handler list disables the normal
 	     suppression of the debugger.  */
-	  || (CONSP (clause) && CONSP (XCAR (clause))
-	      && !NILP (Fmemq (Qdebug, XCAR (clause))))
+	  || (CONSP (clause) && CONSP (clause)
+	      && !NILP (Fmemq (Qdebug, clause)))
 	  /* Special handler that means "print a message and run debugger
 	     if requested".  */
 	  || EQ (h->tag_or_ch, Qerror)))

src/xdisp.c

@@ -2804,8 +2804,9 @@ init_iterator (struct it *it, struct window *w,
     it->redisplay_end_trigger_charpos
       = marker_position (w->redisplay_end_trigger);
   else if (INTEGERP (w->redisplay_end_trigger))
-    it->redisplay_end_trigger_charpos =
-      clip_to_bounds (PTRDIFF_MIN, XINT (w->redisplay_end_trigger), PTRDIFF_MAX);
+    it->redisplay_end_trigger_charpos
+      = clip_to_bounds (PTRDIFF_MIN, XINT (w->redisplay_end_trigger),
+			PTRDIFF_MAX);
   it->tab_width = SANE_TAB_WIDTH (current_buffer);