[Emacs-diffs] Changes to emacs/lisp/progmodes/grep.el

[Richard M . Stallman]

Index: emacs/lisp/progmodes/grep.el
diff -c emacs/lisp/progmodes/grep.el:1.27 emacs/lisp/progmodes/grep.el:1.28
*** emacs/lisp/progmodes/grep.el:1.27   Thu Oct 28 09:00:26 2004
--- emacs/lisp/progmodes/grep.el        Wed Nov  3 11:43:36 2004
***************
*** 436,444 ****
  
  (defun grep-default-command ()
    (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.
--- 436,446 ----
  
  (defun grep-default-command ()
    (let ((tag-default
!          (shell-quote-argument
!           (or (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.
***************
*** 460,466 ****
                                              0 (match-beginning 2))
                                   " *."
                                   (file-name-extension buffer-file-name))))
!       (replace-match (or tag-default "") t t grep-default 1))))
  
  ;;;###autoload
  (defun grep (command-args &optional highlight-regexp)
--- 462,468 ----
                                              0 (match-beginning 2))
                                   " *."
                                   (file-name-extension buffer-file-name))))
!       (replace-match tag-default t t grep-default 1))))
  
  ;;;###autoload
  (defun grep (command-args &optional highlight-regexp)