[slime-cvs] CVS slime/contrib

[CVS User trittweiler]

Update of /project/slime/cvsroot/slime/contrib
In directory cl-net:/tmp/cvs-serv32498/contrib

Modified Files:
	slime-enclosing-context.el ChangeLog 
Log Message:
	Local M-. and local arglist display didn't work for

	   (flet ((foo () ...))
	     (some-form)
	     |)

	* slime-enclosing-context.el (slime-enclosing-bound-names),
	(slime-enclosing-bound-functions): Correctly test for when point
	is in scope of an FLET/LET/etc.
	([test] enclosing-context.1): Test for this.


--- /project/slime/cvsroot/slime/contrib/slime-enclosing-context.el	2008/09/13 10:39:02	1.2
+++ /project/slime/cvsroot/slime/contrib/slime-enclosing-context.el	2009/01/18 14:18:53	1.3
@@ -47,7 +47,7 @@
 	    for point in points
 	    do (when (and (slime-binding-op-p op) 
 			  ;; Are the bindings of OP in scope?
-			  (= index (slime-binding-op-body-pos op)))
+			  (>= index (slime-binding-op-body-pos op)))
 		 (goto-char point) 
 		 (forward-sexp (slime-binding-op-bindings-pos op))
 		 (down-list)
@@ -72,12 +72,14 @@
 	    for point in points
 	    do (when (and (slime-binding-op-p op :function) 
 			  ;; Are the bindings of OP in scope?
-			  (= index (slime-binding-op-body-pos op)))
+			  (>= index (slime-binding-op-body-pos op)))
 		 (goto-char point)
 		 (forward-sexp (slime-binding-op-bindings-pos op))
 		 (down-list)
-		 (ignore-errors
-		   (loop 
+                 ;; If we're at the end of the bindings, an error will
+                 ;; be signalled by the `down-list' below.
+		 (ignore-errors 
+		   (loop
 		    (down-list) 
 		    (destructuring-bind (name arglist)
 			(slime-ensure-list (slime-parse-sexp-at-point 2))
@@ -100,7 +102,12 @@
 	       (,foo 42))
 	   *HERE*))" 
        (",nil" "bar" ",foo")
-       ((",nil" "()"))))
+       ((",nil" "()")))
+      ("(flet ((foo ()))
+         (quux)
+         (bar *HERE*))"
+       ("foo")
+       (("foo" "()"))))
   (slime-check-top-level)
   (with-temp-buffer
     (let ((tmpbuf (current-buffer)))
--- /project/slime/cvsroot/slime/contrib/ChangeLog	2009/01/16 15:48:53	1.166
+++ /project/slime/cvsroot/slime/contrib/ChangeLog	2009/01/18 14:18:53	1.167
@@ -1,3 +1,16 @@
+2009-01-18  Tobias C. Rittweiler  <tcr at freebits.de>
+
+	Local M-. and local arglist display didn't work for
+
+	   (flet ((foo () ...))
+	     (some-form)
+	     |)
+
+	* slime-enclosing-context.el (slime-enclosing-bound-names),
+	(slime-enclosing-bound-functions): Correctly test for when point
+	is in scope of an FLET/LET/etc.
+	([test] enclosing-context.1): Test for this.
+
 2009-01-16   David Reitter <david.reitter at gmail.com>
 
 	* slime-repl.el (slime-repl-clear-buffer): Call recenter with t as