[slime-cvs] CVS slime

[heller]

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

Modified Files:
	ChangeLog slime.el 
Log Message:
Fix apropos in Emacs 22.

* slime.el (slime-print-apropos): Add button props for Emacs 22.
(slime-call-describer): ARG is a marker in Emacs 22.

(def-slime-selector-method ?c): Wait until slime-list-threads
returns.



--- /project/slime/cvsroot/slime/ChangeLog	2007/09/19 11:32:35	1.1224
+++ /project/slime/cvsroot/slime/ChangeLog	2007/09/19 11:36:47	1.1225
@@ -1,5 +1,13 @@
 2007-09-19  Helmut Eller  <heller at common-lisp.net>
 
+	Fix apropos in Emacs 22.
+
+	* slime.el (slime-print-apropos): Add button props for Emacs 22.
+	(slime-call-describer): ARG is a marker in Emacs 22.
+
+	(def-slime-selector-method ?c): Wait until slime-list-threads
+	returns.
+
 	Remove define-slime-dialect.
 
 	* slime.el (define-slime-dialect): Deleted. Use
--- /project/slime/cvsroot/slime/slime.el	2007/09/19 11:32:35	1.868
+++ /project/slime/cvsroot/slime/slime.el	2007/09/19 11:36:47	1.869
@@ -6048,12 +6048,17 @@
 		(princ (etypecase value
 			 (string value)
 			 ((member :not-documented) "(not documented)")))
-		(put-text-property start (point) 'type prop)
-		(put-text-property start (point) 'action 'slime-call-describer)
+                (add-text-properties 
+                 start (point)
+                 (list 'type prop 'action 'slime-call-describer
+                       'button t 'apropos-label namespace 
+                       'item (plist-get plist :designator)))
 		(terpri)))))))
 
-(defun slime-call-describer (item)
-  (let ((type (get-text-property (point) 'type)))
+(defun slime-call-describer (arg)
+  (let* ((pos (if (markerp arg) arg (point)))
+         (type (get-text-property pos 'type))
+         (item (get-text-property pos 'item)))
     (slime-eval-describe `(swank:describe-definition-for-emacs ,item ,type))))
 
 
@@ -7909,6 +7914,7 @@
 (def-slime-selector-method ?t
   "SLIME threads buffer."
   (slime-list-threads)
+  (slime-eval `(cl:quote nil))          ;wait until slime-list-threads returns
   "*slime-threads*")
 
 (defun slime-recently-visited-buffer (mode)