[Emacs-diffs] trunk r116151: * src/eval.c (Fsignal): Fix `debug' handling to match 2013-10-03 change.

[Stefan Monnier]

------------------------------------------------------------
revno: 116151
revision-id: address@hidden
parent: address@hidden
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Fri 2014-01-24 22:48:29 -0500
message:
  * src/eval.c (Fsignal): Fix `debug' handling to match 2013-10-03 change.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/eval.c                     eval.c-20091113204419-o5vbwnq5f7feedwu-237
  src/xdisp.c                    xdisp.c-20091113204419-o5vbwnq5f7feedwu-240

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-01-24 20:55:22 +0000
+++ b/src/ChangeLog     2014-01-25 03:48:29 +0000
@@ -1,3 +1,7 @@
+2014-01-25  Stefan Monnier  <address@hidden>
+
+       * eval.c (Fsignal): Fix `debug' handling to match 2013-10-03 change.
+
 2014-01-24  Paul Eggert  <address@hidden>
 
        Fix bool-vector-count-population bug on MinGW64 (Bug#16535).

=== modified file 'src/eval.c'
--- a/src/eval.c        2014-01-01 07:43:34 +0000
+++ b/src/eval.c        2014-01-25 03:48:29 +0000
@@ -1533,8 +1533,8 @@
          || 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)))

=== modified file 'src/xdisp.c'
--- a/src/xdisp.c       2014-01-24 03:53:16 +0000
+++ b/src/xdisp.c       2014-01-25 03:48:29 +0000
@@ -2804,8 +2804,9 @@
     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);