[slime-cvs] CVS slime

[CVS User heller]

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

Modified Files:
	ChangeLog slime.el 
Log Message:
* slime.el (slime-transcript-start-hook)
(slime-transcript-stop-hook): New hooks.
(slime-eval-with-transcript): Use them.
(slime-eval-with-transcript-cont): Deleted.

* inferior-slime.el (inferior-slime-show-transcript)
(inferior-slime-stop-transcript, inferior-slime-start-transcript):
New functions.
(inferior-slime-init): Install transcript hooks.

--- /project/slime/cvsroot/slime/ChangeLog	2009/08/19 14:58:02	1.1842
+++ /project/slime/cvsroot/slime/ChangeLog	2009/08/21 17:16:42	1.1843
@@ -1,21 +1,28 @@
+2009-08-21  Helmut Eller  <heller at common-lisp.net>
+
+	* slime.el (slime-transcript-start-hook)
+	(slime-transcript-stop-hook): New hooks.
+	(slime-eval-with-transcript): Use them.
+	(slime-eval-with-transcript-cont): Deleted.
+
 2009-08-19  Mark Evenson  <evenson at panix.com>
 
 	* swank-abcl.lisp: Accommodate the new Java/Lisp stack frame
 	abstraction in the upcoming abcl-0.16. (based on code from Tobias
 	Rittweiler).
-	
+
 2009-08-18  Mark Evenson  <evenson at panix.com>
 
 	Add multithreading code for abcl-0.16. (Tobias Rittweiler)
 
 	* swank-abcl.lisp: A multithread implementation taking advantage
-	of the new synchronization primitives in abcl-0.16.  
+	of the new synchronization primitives in abcl-0.16.
 
 	Restore working with abcl-0.15.
 
 	* swank-abcl.lisp: Remove the warm initialization code for
 	SWANK:COMPILER-CONDITION, as it is no longer needed for the
-	current release of ABCL. 
+	current release of ABCL.
 
 2009-08-16  StanisBaw Halik <sthalik at test123.ltd.pl>
 
--- /project/slime/cvsroot/slime/slime.el	2009/08/15 16:01:17	1.1214
+++ /project/slime/cvsroot/slime/slime.el	2009/08/21 17:16:42	1.1215
@@ -4199,8 +4199,7 @@
 inserted in the current buffer."
   (interactive (list (slime-read-from-minibuffer "Slime Eval: ")))
   (cond ((not current-prefix-arg)
-         (slime-eval-with-transcript `(swank:interactive-eval ,string) 
-                                     string))
+         (slime-eval-with-transcript `(swank:interactive-eval ,string)))
         (t
          (slime-eval-print string))))
 
@@ -4214,42 +4213,21 @@
                       (destructuring-bind (output value) result
                         (insert output value)))))
 
-(defun slime-eval-with-transcript (form &optional msg no-popups cont)
-  "Eval FROM in Lisp.  Display output, if any, caused by the evaluation."
-  ;;(when msg (slime-insert-transcript-delimiter msg))
-  ;;(setq slime-repl-popup-on-output (not no-popups))
-  (setq cont (or cont #'slime-display-eval-result))
-  (slime-rex (cont (buffer (current-buffer))) (form)
-    ((:ok value) (slime-eval-with-transcript-cont t value cont buffer))
-    ((:abort) (slime-eval-with-transcript-cont nil nil nil buffer))))
-
-;;(defun slime-insert-transcript-delimiter (string)
-;;  (with-current-buffer (slime-output-buffer)
-;;    (save-excursion
-;;      (goto-char slime-repl-input-start-mark)
-;;      (unless (bolp) (insert-before-markers "\n"))
-;;      (slime-propertize-region '(slime-transcript-delimiter t)
-;;        (insert-before-markers
-;;         ";;;; " (subst-char-in-string ?\n ?\ 
-;;                                       (substring string 0 
-;;                                                  (min 60 (length string))))
-;;         " ...\n"))
-;;      (assert (= (point) slime-repl-input-start-mark))
-;;      (slime-mark-output-start))
-;;    (slime-repl-show-maximum-output)))
-
-(defun slime-eval-with-transcript-cont (ok result cont buffer)
-  (run-with-timer 0.2 nil (lambda ()
-                            ;;(setq slime-repl-popup-on-output nil)
-                            ))
-  ;;(with-current-buffer (slime-output-buffer)
-  ;;  (save-excursion (slime-repl-insert-prompt))
-  ;;  (slime-repl-show-maximum-output))
-  (cond ((not ok)
-         (message "Evaluation aborted."))
-        (t
-         (with-current-buffer buffer
-           (funcall cont result)))))
+(defvar slime-transcript-start-hook nil
+  "Hook run before start an evalution.")
+(defvar slime-transcript-stop-hook nil
+  "Hook run after finishing a evalution.")
+
+(defun slime-eval-with-transcript (form)
+  "Eval FROM in Lisp.  Display output, if any."
+  (run-hooks 'slime-transcript-start-hook)
+  (slime-rex () (form)
+    ((:ok value)
+     (run-hooks 'slime-transcript-stop-hook)
+     (slime-display-eval-result value))
+    ((:abort)
+     (run-hooks 'slime-transcript-stop-hook)
+     (message "Evaluation aborted."))))
         
 (defun slime-eval-describe (form)
   "Evaluate FORM in Lisp and display the result in a new buffer."
@@ -4257,8 +4235,7 @@
                                        (slime-current-package))))
 
 (defvar slime-description-autofocus nil
-  "If NIL (the default) Slime description buffers do not grab
-focus automatically.")
+  "If non-nil select description windows on display.")
 
 (defun slime-show-description (string package)
   ;; So we can have one description buffer open per connection. Useful