[slime-cvs] CVS slime

[mkoeppe]

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

Modified Files:
	slime.el 
Log Message:
(slime-parse-extended-operator-name)
(slime-enclosing-operator-names): Fix the case when point is
within the operator.


--- /project/slime/cvsroot/slime/slime.el	2006/06/17 15:07:09	1.628
+++ /project/slime/cvsroot/slime/slime.el	2006/06/17 16:10:54	1.629
@@ -10076,13 +10076,15 @@
       (error "No expression at point.")))
 
 (defun slime-parse-extended-operator-name (name)
-  "Assume that point is behind the operator call to NAME in the
+  "Assume that point is at the operator NAME in the
 current buffer.  If NAME is MAKE-INSTANCE or another operator in
 `slime-extendeded-operator-name-parser-alist', collect additional
 information from the operator call and encode it as an extended
 operator name like (MAKE-INSTANCE CLASS \"make-instance\").  Return
 NAME or the extended operator name."
   (ignore-errors
+    (forward-char (1+ (length name)))
+    (slime-forward-blanks)
     (let* ((symbol-name (upcase (slime-cl-symbol-name name)))
            (assoc (assoc symbol-name slime-extended-operator-name-parser-alist)))
       (when assoc
@@ -10152,8 +10154,6 @@
                 (incf level)
                 (forward-char 1)
                 (when-let (name (slime-symbol-name-at-point))
-                  (forward-char (1+ (length name)))
-                  (slime-forward-blanks)
                   (push (slime-parse-extended-operator-name name) result)
                   (push arg-index arg-indices))
                 (backward-up-list 1)))))))