[slime-cvs] CVS slime/contrib

[CVS User trittweiler]

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

Modified Files:
	ChangeLog slime-asdf.el 
Log Message:
	* slime-asdf.el (slime-rgrep-system): Conditionalize on whether
	`rgrep' is available (it isn't on Emacs 21.) Also make sure to
	call `grep-compute-defaults' before `grep-read-regexp' because the
	former does some necessary setup. (Seems to be of a problem on
	Emacs from CVS.)


--- /project/slime/cvsroot/slime/contrib/ChangeLog	2009/11/23 12:25:42	1.285
+++ /project/slime/cvsroot/slime/contrib/ChangeLog	2009/11/23 21:48:52	1.286
@@ -1,5 +1,13 @@
 2009-11-23  Tobias C. Rittweiler  <tcr at freebits.de>
 
+	* slime-asdf.el (slime-rgrep-system): Conditionalize on whether
+	`rgrep' is available (it isn't on Emacs 21.) Also make sure to
+	call `grep-compute-defaults' before `grep-read-regexp' because the
+	former does some necessary setup. (Seems to be of a problem on
+	Emacs from CVS.)
+
+2009-11-23  Tobias C. Rittweiler  <tcr at freebits.de>
+
 	* slime-repl.el (slime-repl-previous-matching-input)
 	(slime-repl-next-matching-input): Read input by means of
 	`slime-read-from-minibuffer' so TAB will complete symbols for us.
--- /project/slime/cvsroot/slime/contrib/slime-asdf.el	2009/11/23 12:23:35	1.17
+++ /project/slime/cvsroot/slime/contrib/slime-asdf.el	2009/11/23 21:48:52	1.18
@@ -114,15 +114,19 @@
      (when directory
        (dired directory)))))
 
-(defun slime-rgrep-system (sys-name regexp)
-  "Run `rgrep' on the base directory of an ASDF system."
-  (interactive (list (slime-read-system-name nil nil t)
-                     (grep-read-regexp)))
-  (rgrep regexp "*.lisp"
-         (slime-eval `(swank:asdf-system-directory ,sys-name))))
+(if (fboundp 'rgrep)
+    (defun slime-rgrep-system (sys-name regexp)
+      "Run `rgrep' on the base directory of an ASDF system."
+      (interactive (progn (grep-compute-defaults)
+                          (list (slime-read-system-name nil nil t)
+                                (grep-read-regexp))))
+      (rgrep regexp "*.lisp"
+             (slime-eval `(swank:asdf-system-directory ,sys-name))))
+    (defun slime-rgrep-system ()
+      (interactive)
+      (error "This command is only supported on GNU Emacs >21.x.")))
 
 (if (boundp 'multi-isearch-next-buffer-function)
-
     (defun slime-isearch-system (sys-name)
       "Run `isearch-forward' on the files of an ASDF system."
       (interactive (list (slime-read-system-name nil nil t)))
@@ -144,7 +148,6 @@
                           (car buffers)
                           (second (memq current-buffer buffers))))))))
         (isearch-forward)))
-
     (defun slime-isearch-system ()
       (interactive)
       (error "This command is only supported on GNU Emacs >23.1.x.")))