[slime-cvs] CVS slime

[heller]

Update of /project/slime/cvsroot/slime
In directory clnet:/tmp/cvs-serv27007

Modified Files:
	ChangeLog slime.el 
Log Message:
* slime.el (slime-eval-with-transcript): Change order of arguments to
make the common case easier to use.

--- /project/slime/cvsroot/slime/ChangeLog	2008/09/18 15:23:37	1.1520
+++ /project/slime/cvsroot/slime/ChangeLog	2008/09/18 15:23:43	1.1521
@@ -19,6 +19,8 @@
 	(slime-eval-with-transcript-cont): Consistently use save-excursion
 	and insert-before-markers.  We always want to preserve the cursor
 	position in the input region (for type-ahead).
+	(slime-eval-with-transcript):  Change order of arguments to
+	make the common case easier to use.
 
 	(slime-batch-test): Use a timer.
 	(slime-check-buffer-contents): New function to test contents and
@@ -32,7 +34,7 @@
 	(interactive-eval, interactive-eval): Don't use fresh-line, as
 	that makes it harder to test the REPL code.
 
-	* test.sh (Usage): Add a -T switch to run slime in the current
+	* test.sh (usage): Add a -T switch to run slime in the current
 	directory without copying (and compiling) everything to a
 	temporary directory.
 
--- /project/slime/cvsroot/slime/slime.el	2008/09/18 15:23:37	1.1026
+++ /project/slime/cvsroot/slime/slime.el	2008/09/18 15:23:43	1.1027
@@ -3924,9 +3924,9 @@
   (run-hook-with-args 'slime-before-compile-functions (point-min) (point-max))
   (let ((file (slime-to-lisp-filename (buffer-file-name))))
     (slime-eval-with-transcript
+     `(swank:compile-file-for-emacs ,file ,(if load t nil))
      (format "Compile file %s" file)
      slime-display-compilation-output
-     `(swank:compile-file-for-emacs ,file ,(if load t nil))
      (slime-rcurry #'slime-compilation-finished (current-buffer)))
     (message "Compiling %s..." file)))
 
@@ -5405,8 +5405,8 @@
 inserted in the current buffer."
   (interactive (list (slime-read-from-minibuffer "Slime Eval: ")))
   (cond ((not current-prefix-arg)
-         (slime-eval-with-transcript string t `(swank:interactive-eval ,string)
-                                     'slime-display-eval-result))
+         (slime-eval-with-transcript `(swank:interactive-eval ,string) 
+                                     string))
         (t
          (slime-eval-print string))))
 
@@ -5422,10 +5422,11 @@
                           (destructuring-bind (output value) result
                             (insert output value)))))))
 
-(defun slime-eval-with-transcript (msg show-output form cont)
+(defun slime-eval-with-transcript (form &optional msg no-popups cont)
   "Eval FROM in Lisp.  Display output, if any, caused by the evaluation."
-  (slime-insert-transcript-delimiter msg)
-  (setq slime-repl-popup-on-output show-output)
+  (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) (form)
     ((:ok value) (slime-eval-with-transcript-cont t value cont))
     ((:abort) (slime-eval-with-transcript-cont nil nil nil))))
@@ -5514,7 +5515,7 @@
 (defun slime-eval-region (start end)
   "Evaluate region."
   (interactive "r")
-  (slime-eval-with-transcript
+  (slime-eval-with-transcript 
    `(swank:interactive-eval-region 
      ,(buffer-substring-no-properties start end))))
 
@@ -5864,8 +5865,6 @@
   (let ((lisp-filename (slime-to-lisp-filename (expand-file-name filename))))
     (slime-eval-with-transcript `(swank:load-file ,lisp-filename))))
 
-
-
 
 ;;;; Profiling