Merged in changes from CVS trunk.

Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-509
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-510
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-511
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-512
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-513
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-514
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-515
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-516
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-517
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-518
   Update from CVS


git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-239

2 files changed, 1 insertions, 42 deletions

diff --git a/lisp/progmodes/etags.el b/lisp/progmodes/etags.el
index 4464df3a916..ddbd2ce6f35 100644
--- a/lisp/progmodes/etags.el
+++ b/lisp/progmodes/etags.el
@@ -772,26 +772,6 @@ Assumes the tags table is the current buffer."
         (all-completions string (tags-completion-table) predicate)
       (try-completion string (tags-completion-table) predicate))))
 
-;; Return a default tag to search for, based on the text at point.
-(defun find-tag-default ()
-  (save-excursion
-    (while (looking-at "\\sw\\|\\s_")
-      (forward-char 1))
-    (if (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))
-        (progn (goto-char (match-end 0))
-               (buffer-substring-no-properties
-                (point)
-                (progn (forward-sexp -1)
-                       (while (looking-at "\\s'")
-                         (forward-char 1))
-                       (point))))
-      nil)))
-
 ;; Read a tag name from the minibuffer with defaulting and completion.
 (defun find-tag-tag (string)
   (let* ((completion-ignore-case (if (memq tags-case-fold-search '(t nil))
diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el
index 5b678f26171..f4acd564a3c 100644
--- a/lisp/progmodes/grep.el
+++ b/lisp/progmodes/grep.el
@@ -384,9 +384,7 @@ Set up `compilation-exit-message-function' and run `grep-setup-hook'."
   (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 @@ temporarily highlight in visited source lines."
   (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.