From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Sat, 25 Jan 2014 03:48:29 +0000 (-0500)
Subject: * src/eval.c (Fsignal): Fix `debug' handling to match 2013-10-03 change.
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~256
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=afd4479fde97159b758a6f5124611c260e292b80;p=emacs.git

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

diff --git a/src/ChangeLog b/src/ChangeLog
index e1e9cba7640..98c890c97b4 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+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).
diff --git a/src/eval.c b/src/eval.c
index 8d0c08b2e3a..91b8d17769d 100644
--- a/src/eval.c
+++ b/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)))
diff --git a/src/xdisp.c b/src/xdisp.c
index e59612696e9..7717f1c2861 100644
--- a/src/xdisp.c
+++ b/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);