[slime-cvs] CVS slime/contrib

[CVS User sboukarev]

Update of /project/slime/cvsroot/slime/contrib
In directory cl-net:/tmp/cvs-serv15670/contrib

Modified Files:
	ChangeLog slime-repl.el 
Log Message:
* swank.lisp (eval-for-emacs): Send (:abort condition) where
condition is a condition which was aborted instead of just (:abort).
* slime.el: Handle the above change.

* contrib/slime-repl.el: Handle (:abort condition) message from lisp.


--- /project/slime/cvsroot/slime/contrib/ChangeLog	2010/09/18 20:47:29	1.421
+++ /project/slime/cvsroot/slime/contrib/ChangeLog	2010/09/22 19:17:35	1.422
@@ -1,3 +1,7 @@
+2010-09-22  Stas Boukarev  <stassats at gmail.com>
+
+	* slime-repl.el: Handle (:abort condition) message from lisp.
+
 2010-09-18  Tobias C. Rittweiler <tcr at freebits.de>
 
 	* slime-parse.el (slime-parse-form-upto-point): Fix lp#627308.
--- /project/slime/cvsroot/slime/contrib/slime-repl.el	2010/09/03 19:04:28	1.50
+++ /project/slime/cvsroot/slime/contrib/slime-repl.el	2010/09/22 19:17:35	1.51
@@ -524,8 +524,8 @@
       ((list 'swank:listener-eval string) (slime-lisp-package))
     ((:ok result)
      (slime-repl-insert-result result))
-    ((:abort)
-     (slime-repl-show-abort))))
+    ((:abort condition)
+     (slime-repl-show-abort condition))))
 
 (defun slime-repl-insert-result (result)
   (with-current-buffer (slime-output-buffer)
@@ -541,13 +541,13 @@
       (slime-repl-insert-prompt))
     (slime-repl-show-maximum-output)))
 
-(defun slime-repl-show-abort ()
+(defun slime-repl-show-abort (condition)
   (with-current-buffer (slime-output-buffer)
     (save-excursion
       (slime-save-marker slime-output-start
         (slime-save-marker slime-output-end
           (goto-char slime-output-end)
-          (insert-before-markers "; Evaluation aborted.\n")
+          (insert-before-markers (format "; Evaluation aborted on %s.\n" condition))
           (slime-repl-insert-prompt))))
     (slime-repl-show-maximum-output)))