[slime-cvs] CVS update: slime/swank.lisp

[Helmut Eller]

Update of /project/slime/cvsroot/slime
In directory common-lisp.net:/tmp/cvs-serv32161

Modified Files:
	swank.lisp 
Log Message:
(ed-in-emacs): New allowed form for argument.

(pprint-eval-string-in-frame): Apply arguments in proper order.
Date: Tue Mar 30 18:08:31 2004
Author: heller

Index: slime/swank.lisp
diff -u slime/swank.lisp:1.155 slime/swank.lisp:1.156
--- slime/swank.lisp:1.155	Sat Mar 27 16:14:52 2004
+++ slime/swank.lisp	Tue Mar 30 18:08:31 2004
@@ -972,7 +972,7 @@
 (defslimefun pprint-eval-string-in-frame (string index)
   (swank-pprint
    (multiple-value-list 
-    (eval-in-frame index (from-string string)))))
+    (eval-in-frame (from-string string) index))))
 
 (defslimefun frame-locals-for-emacs (index)
   "Return a property list ((&key NAME ID VALUE) ...) describing
@@ -1037,9 +1037,7 @@
           (t "; No value"))))
 
 (defslimefun interactive-eval (string)
-  (let ((values (multiple-value-list
-                 (eval (let ((*package* *buffer-package*))
-                         (from-string string))))))
+  (let ((values (multiple-value-list (eval (from-string string)))))
     (fresh-line)
     (force-output)
     (format-values-for-echo-area values)))
@@ -1135,7 +1133,14 @@
 
 (defslimefun ed-in-emacs (&optional what)
   "Edit WHAT in Emacs.
-WHAT can be a filename (pathname or string) or function name (symbol)."
+
+WHAT can be:
+  A filename (string),
+  A list (FILENAME LINE [COLUMN]),
+  A function name (symbol),
+  nil."
+  (if (and (listp what) (pathnamep (first what)))
+      (setf (car what) (canonicalize-filename (car what))))
   (send-oob-to-emacs `(:ed ,(if (pathnamep what)
                                 (canonicalize-filename what)
                                 what))))