[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/progmodes/grep.el
From: |
Richard M . Stallman |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/progmodes/grep.el |
Date: |
Sat, 28 Aug 2004 11:35:57 -0400 |
Index: emacs/lisp/progmodes/grep.el
diff -c emacs/lisp/progmodes/grep.el:1.18 emacs/lisp/progmodes/grep.el:1.19
*** emacs/lisp/progmodes/grep.el:1.18 Wed Jul 14 22:25:09 2004
--- emacs/lisp/progmodes/grep.el Sat Aug 28 15:31:20 2004
***************
*** 384,392 ****
(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)))
(sh-arg-re "\\(\\(?:\"\\(?:[^\"]\\|\\\\\"\\)+\"\\|'[^']+'\\|[^\"'
\t\n]\\)+\\)")
(grep-default (or (car grep-history) grep-command)))
;; Replace the thing matching for with that around cursor.
--- 384,390 ----
(let ((tag-default
(funcall (or find-tag-default-function
(get major-mode 'find-tag-default-function)
! '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,481 ****
(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.
--- 455,460 ----
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] Changes to emacs/lisp/progmodes/grep.el,
Richard M . Stallman <=