[slime-cvs] CVS slime

[mkoeppe]

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

Modified Files:
	slime.el 
Log Message:
(slime-copy-presentation-at-mouse-to-point): Manually
invoke the after-change function, so that the presentation overlay
is created even if we paste to non-REPL buffers.
(slime-menu-choices-for-presentation): Evaluate
menu-choices-for-presentation-id in the right buffer, thus in the
right Lisp thread.  Reported by Attila Lendvai.
(slime-menu-choices-for-presentation): Show the id of the presentation.
(sldb-insert-locals): Include the thread id in the presentation id.


--- /project/slime/cvsroot/slime/slime.el	2007/03/21 14:52:38	1.769
+++ /project/slime/cvsroot/slime/slime.el	2007/03/21 15:50:11	1.770
@@ -3447,6 +3447,7 @@
                                (buffer-substring (1- (point)) (point))))
         (insert " "))
       (insert presentation-text)
+      (slime-after-change-function (point) (point))
       (when (and (not (eolp)) (not (looking-at "\\s-")))
         (insert " ")))))
 
@@ -3492,15 +3493,16 @@
 (defun slime-menu-choices-for-presentation (presentation buffer from to choice-to-lambda)
   "Return a menu for `presentation' at `from'--`to' in `buffer', suitable for `x-popup-menu'."
   (let* ((what (slime-presentation-id presentation))
-         (choices (slime-eval 
-                   `(swank::menu-choices-for-presentation-id ',what))))
+         (choices (with-current-buffer buffer
+                    (slime-eval 
+                     `(swank::menu-choices-for-presentation-id ',what)))))
     (flet ((savel (f) ;; IMPORTANT - xemacs can't handle lambdas in x-popup-menu. So give them a name
             (let ((sym (gensym)))
               (setf (gethash sym choice-to-lambda) f)
               sym)))
     (etypecase choices
       (list
-       `(,(if (featurep 'xemacs) " " "")
+       `(,(format "Presentation %s" what)
          ("" 
           ("Inspect" . ,(savel 'slime-inspect-presentation-at-mouse))
           ("Describe" . ,(savel 'slime-describe-presentation-at-mouse))
@@ -8659,7 +8661,7 @@
                     " = ")
             (slime-insert-presentation
              (in-sldb-face local-value value)
-             `(:frame-var ,(car frame) ,i))
+             `(:frame-var ,slime-current-thread ,(car frame) ,i))
             (insert "\n")))))
 
 (defun sldb-hide-frame-details ()