emacs-jabber fsm.el,2.4,2.5

[Magnus H. <leg...@us...>]

Update of /cvsroot/emacs-jabber/emacs-jabber
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv19576

Modified Files:
	fsm.el 
Log Message:
Revision: ma...@fr...--2005/emacs-jabber--cvs-head--0--patch-469
Creator:  Magnus Henoch <ma...@fr...>

Try to make state machines debuggable


Index: fsm.el
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/fsm.el,v
retrieving revision 2.4
retrieving revision 2.5
diff -u -d -r2.4 -r2.5
--- fsm.el	12 Aug 2007 22:00:29 -0000	2.4
+++ fsm.el	8 Mar 2008 11:13:48 -0000	2.5
@@ -1,6 +1,6 @@
 ;;; fsm.el --- state machine library
 
-;; Copyright (C) 2006, 2007  Magnus Henoch
+;; Copyright (C) 2006, 2007, 2008  Magnus Henoch
 
 ;; Author: Magnus Henoch <ma...@fr...>
 ;; Version: 0.1ttn4
@@ -335,7 +335,7 @@
 		(fsm-debug-output "Using data from enter function")
 		(plist-put (cddr fsm) :state-data newer-state-data)
 		(fsm-maybe-change-timer fsm newer-timeout))
-	    (error
+	    ((debug error)
 	     (fsm-debug-output "Didn't work: %S" e)))))
 
       (let ((deferred (nreverse (plist-get (cddr fsm) :deferred))))
@@ -360,7 +360,7 @@
       (let ((result (condition-case e
 			(funcall state-fn fsm state-data event 
 				 (or callback 'ignore))
-		      (error (cons :error-signaled e)))))
+		      ((debug error) (cons :error-signaled e)))))
 	;; Special case for deferring an event until next state change.
 	(cond
 	 ((eq result :defer)