[slime-cvs] CVS slime/contrib

[CVS User trittweiler]

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

Modified Files:
	ChangeLog slime-package-fu.el slime-parse.el 
Log Message:
	* slime.el (slime-at-list-p): Deleted.
	(slime-at-expression-p): Moved to slime-package-fu.
	(slime-forward-blanks): Deleted. Use `(skip-chars-forward
	"[:space:]")' instead.
	(slime-forward-any-comment): Deleted.
	(slime-reader-conditionals-regexp): Make a constant so it's
	inlined.
	(slime-unknown-feature-expression): Make it an error.

	* slime-package-fu.el (slime-at-expression-p): Moved from
	slime.el.
	(slime-goto-next-export-clause): Replace `slime-forward-blanks'.

	* slime-parse.el (slime-parse-sexp-at-point)
	(slime-parse-extended-operator-name): Replace
	`slime-forward-blanks'.


--- /project/slime/cvsroot/slime/contrib/ChangeLog	2009/12/19 14:56:07	1.310
+++ /project/slime/cvsroot/slime/contrib/ChangeLog	2009/12/21 13:31:56	1.311
@@ -1,3 +1,13 @@
+2009-12-21  Tobias C. Rittweiler  <tcr at freebits.de>
+
+	* slime-package-fu.el (slime-at-expression-p): Moved from
+	slime.el.
+	(slime-goto-next-export-clause): Replace `slime-forward-blanks'.
+
+	* slime-parse.el (slime-parse-sexp-at-point)
+	(slime-parse-extended-operator-name): Replace
+	`slime-forward-blanks'.
+
 2009-12-19  Stas Boukarev  <stassats at gmail.com>
 
 	* swank-asdf.lisp (asdf:operation-done-p): ASDF included with some
--- /project/slime/cvsroot/slime/contrib/slime-package-fu.el	2009/11/07 02:04:56	1.6
+++ /project/slime/cvsroot/slime/contrib/slime-package-fu.el	2009/12/21 13:31:56	1.7
@@ -78,6 +78,15 @@
 		 (slime-find-package-definition-regexp package))))
 	(error "Couldn't find source definition of package: %s" package))))
 
+(defun slime-at-expression-p (pattern)
+  (when (ignore-errors
+          ;; at a list?
+          (= (point) (progn (down-list 1)
+                            (backward-up-list 1)
+                            (point))))
+    (save-excursion
+      (down-list 1)
+      (slime-in-expression-p pattern))))
 
 (defun slime-goto-next-export-clause ()
   ;; Assumes we're inside the beginning of a DEFPACKAGE form.
@@ -85,7 +94,7 @@
     (save-excursion
       (block nil
 	(while (ignore-errors (slime-forward-sexp) t)
-	  (slime-forward-blanks)
+	  (skip-chars-forward "[:space:]")
 	  (when (slime-at-expression-p '(:export *))
 	    (setq point (point))
 	    (return)))))
--- /project/slime/cvsroot/slime/contrib/slime-parse.el	2009/11/24 13:17:00	1.29
+++ /project/slime/cvsroot/slime/contrib/slime-parse.el	2009/12/21 13:31:56	1.30
@@ -11,7 +11,7 @@
   (slime-make-form-spec-from-string
    (concat (slime-incomplete-sexp-at-point) ")")))
 
-(defun slime-parse-sexp-at-point (&optional n skip-blanks-p)
+(defun slime-parse-sexp-at-point (&optional n)
   "Returns the sexps at point as a list of strings, otherwise nil.
 \(If there are not as many sexps as N, a list with < N sexps is
 returned.\) 
@@ -19,8 +19,6 @@
 "
   (interactive "p") (or n (setq n 1))
   (save-excursion
-    (when skip-blanks-p ; e.g. `( foo bat)' where point is after ?\(.
-      (slime-forward-blanks))
     (let ((result nil))
       (dotimes (i n)
         ;; Is there an additional sexp in front of us?
@@ -29,7 +27,7 @@
             (return)))
         (push (slime-sexp-at-point) result)
         ;; Skip current sexp
-        (ignore-errors (forward-sexp) (slime-forward-blanks)))
+        (ignore-errors (forward-sexp) (skip-chars-forward "[:space:]")))
       (nreverse result))))
 
 (defun slime-has-symbol-syntax-p (string)
@@ -63,7 +61,7 @@
                          entry)))
         (ignore-errors
           (forward-char (1+ (length current-op)))
-          (slime-forward-blanks))
+          (skip-chars-forward "[:space:]"))
         (when parser
           (multiple-value-setq (forms indices points)
             ;; We pass the fully qualified name (`current-op'), so it's the