[slime-cvs] CVS slime

[trittweiler]

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

Modified Files:
	slime.el ChangeLog 
Log Message:

* slime.el (slime-recompile-locations): Locations were potentially
  recompiled within a wrong package. Fix that.


--- /project/slime/cvsroot/slime/slime.el	2008/07/17 22:19:12	1.947
+++ /project/slime/cvsroot/slime/slime.el	2008/07/17 22:49:36	1.948
@@ -3919,8 +3919,6 @@
 
 ;;;;; Recompilation.
 
-;;; FIXME: Add maximum-debug-p.
-
 (defun slime-recompile-location (location &optional debug-level)
   (save-excursion
     (slime-pop-to-location location 'excursion)
@@ -3931,13 +3929,17 @@
            (save-excursion
              (slime-pop-to-location loc 'excursion)
              (multiple-value-bind (start end) (slime-region-for-defun-at-point)
-               (slime-make-compile-expression-for-swank
-                (buffer-substring-no-properties start end)
-                start)))))
+               ;; FIXME: Kludge. The slime-eval-async may send a buffer-package
+               ;; that is not necessarily the same as the one the LOC points to.
+               `(cl:let ((swank::*buffer-package* (swank::guess-buffer-package 
+                                                   ,(slime-current-package))))
+                  ,(slime-make-compile-expression-for-swank
+                    (buffer-substring-no-properties start end)
+                    start))))))
     (let ((slime-compilation-debug-level debug-level))
       (slime-eval-async 
        `(swank:with-swank-compilation-unit (:override t) 
-          ;; We have to compile each location seperately because of
+          ;; We have to compile each location separately because of
           ;; buffer and offset tracking during notes generation.
           ,@(loop for loc in locations 
                   collect (make-compile-expr loc)))
--- /project/slime/cvsroot/slime/ChangeLog	2008/07/17 22:19:12	1.1370
+++ /project/slime/cvsroot/slime/ChangeLog	2008/07/17 22:49:36	1.1371
@@ -1,5 +1,10 @@
 2008-07-18  Tobias C. Rittweiler  <tcr at freebits.de>
 
+	* slime.el (slime-recompile-locations): Locations were potentially
+	recompiled within a wrong package. Fix that.
+
+2008-07-18  Tobias C. Rittweiler  <tcr at freebits.de>
+
 	An explicit numeric value as prefix-arg given to `C-c C-c' will
 	now represent the debug level the defun is compiled with;
 	`C-u C-c C-c' defaults to maximum debug like before. (Now also