[slime-cvs] CVS slime

[trittweiler]

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

Modified Files:
	slime.el 
Log Message:

* swank.lisp (load-file-set-package): Removed; the function was
  only used in `slime-load-file-set-package' which invokes
  `slime-repl-set-package' which set the package for a second time.

* slime.lisp (slime-load-file-set-package): Don't call
  SWANK:LOAD-FILE-SET-PACKAGE, but merely call SWANK:LOAD-FILE,
  then invoke `slime-repl-set-package' which will set the package.

  (slime-pretty-find-buffer-package): Removed. (Nowhere used.)
  (slime-set-package): Ditto.


--- /project/slime/cvsroot/slime/slime.el	2008/03/13 23:45:00	1.923
+++ /project/slime/cvsroot/slime/slime.el	2008/03/16 10:44:37	1.924
@@ -508,11 +508,6 @@
                     (t name))))
     (format "%s" (read name))))
 
-(defun slime-pretty-find-buffer-package ()
-  "Return a prettied version of `slime-find-buffer-package'."
-  (let ((p (slime-find-buffer-package)))
-    (and p (slime-pretty-package-name p))))
-
 (when slime-update-modeline-package
   (run-with-idle-timer 0.2 0.2 'slime-update-modeline-package))
 
@@ -1272,10 +1267,10 @@
 
 (defun slime-load-file-set-package (filename package)
   (let ((filename (slime-to-lisp-filename filename)))
-    (slime-eval-async `(swank:load-file-set-package ,filename ,package)
-                      (lambda (package)
-                        (when package
-                          (slime-repl-set-package (second package)))))))
+    (slime-eval-async `(swank:load-file ,filename)
+                      (lexical-let ((package package))
+                        (lambda (ignored)
+                          (slime-repl-set-package package))))))
 
 ;;;;; Start inferior lisp
 ;;;
@@ -3280,6 +3275,7 @@
             ((memq (char-before) '(?\t ?\ ))
              (slime-echo-arglist))))))
 
+
 (defun slime-repl-set-package (package)
   "Set the package of the REPL buffer to PACKAGE."
   (interactive (list (let* ((p (slime-current-package))
@@ -6366,11 +6362,6 @@
     (slime-net-close process)
     (message "Connection closed.")))
 
-(defun slime-set-package (package)
-  (interactive (list (slime-read-package-name
-                      "Package: " (slime-pretty-find-buffer-package))))
-  (message "*package*: %s" (slime-eval `(swank:set-package ,package))))
-
 (defun slime-set-default-directory (directory)
   "Make DIRECTORY become Lisp's current directory."
   (interactive (list (read-directory-name "Directory: " nil nil t)))