# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 1093707080 0
# Node ID 5ed31ed85a8eea6174cbb78084c948e1b9adfaba
# Parent  12cc6bc5d5500fab786d98130be830ead2196648
(grep-default-command): Use find-tag-default.
(grep-tag-default): Function deleted.

diff -r 12cc6bc5d550 -r 5ed31ed85a8e lisp/progmodes/grep.el
--- a/lisp/progmodes/grep.el	Sat Aug 28 15:30:31 2004 +0000
+++ b/lisp/progmodes/grep.el	Sat Aug 28 15:31:20 2004 +0000
@@ -384,9 +384,7 @@
   (let ((tag-default
 	 (funcall (or find-tag-default-function
 		      (get major-mode 'find-tag-default-function)
-		      ;; We use grep-tag-default instead of
-		      ;; find-tag-default, to avoid loading etags.
-		      'grep-tag-default)))
+		      'find-tag-default)))
 	(sh-arg-re "\\(\\(?:\"\\(?:[^\"]\\|\\\\\"\\)+\"\\|'[^']+'\\|[^\"' \t\n]\\)+\\)")
 	(grep-default (or (car grep-history) grep-command)))
     ;; Replace the thing matching for with that around cursor.
@@ -457,25 +455,6 @@
   (set (make-local-variable 'compilation-error-regexp-alist)
        grep-regexp-alist))
 
-;; This is a copy of find-tag-default from etags.el.
-;;;###autoload
-(defun grep-tag-default ()
-  (save-excursion
-    (while (looking-at "\\sw\\|\\s_")
-      (forward-char 1))
-    (when (or (re-search-backward "\\sw\\|\\s_"
-				  (save-excursion (beginning-of-line) (point))
-				  t)
-	      (re-search-forward "\\(\\sw\\|\\s_\\)+"
-				 (save-excursion (end-of-line) (point))
-				 t))
-      (goto-char (match-end 0))
-      (buffer-substring (point)
-			(progn (forward-sexp -1)
-			       (while (looking-at "\\s'")
-				 (forward-char 1))
-			       (point))))))
-
 ;;;###autoload
 (defun grep-find (command-args)
   "Run grep via find, with user-specified args COMMAND-ARGS.