[slime-cvs] CVS slime

[trittweiler]

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

Modified Files:
	slime.el 
Log Message:
	* slime.el (slime-cl-symbol-name): Handle vertical bars (|)
	(%slime-nesting-until-point): Renamed to `slime-nesting-until-point'.


--- /project/slime/cvsroot/slime/slime.el	2007/08/26 06:11:56	1.818
+++ /project/slime/cvsroot/slime/slime.el	2007/08/26 09:57:07	1.819
@@ -10352,7 +10352,10 @@
 (defun slime-cl-symbol-name (symbol)
   (let ((n (if (stringp symbol) symbol (symbol-name symbol))))
     (if (string-match ":\\([^:]*\\)$" n)
-	(match-string 1 n)
+	(let ((symbol-part (match-string 1 n)))
+          (if (string-match "^|\\(.*\\)|$" symbol-part)
+              (match-string 1 symbol-part)
+              symbol-part))
       n)))
 
 (defun slime-cl-symbol-package (symbol &optional default)
@@ -10554,7 +10557,7 @@
                (decl-indices (rest current-indices))
                (decl-points  (rest current-points))
                (decl-pos     (1- (first decl-points)))
-               (nesting      (%slime-nesting-until-point decl-pos))
+               (nesting      (slime-nesting-until-point decl-pos))
                (declspec     (concat (slime-incomplete-sexp-at-point nesting)
                                      (make-string nesting ?\)))))
           ;; `(declare ((foo ...))' or `(declare (type (foo ...)))' ?
@@ -10571,7 +10574,7 @@
                 (setq current-points  (list (first decl-points)))))))))
   (values current-forms current-indices current-points))
 
-(defun %slime-nesting-until-point (target-point)
+(defun slime-nesting-until-point (target-point)
   (save-excursion
     (let ((nesting 0))
       (while (> (point) target-point)