compile.el, using grep-find when find-program is not "find"

compile.el, using grep-find when find-program is not "find"

[Marcus Picasso]

In GNU Emacs 21.3.1 (i386-msvc-nt5.0.2195) of 2003-03-28 on buffy:

Changing the lisp variable "find-program" to something else than "find"
makes compile.el position the point at wrong place, when doing "M-x
grep-find".

Hint:

Compile.el has in "grep-compute-defaults" a line which I think takes care of
point-positioning, and it handles different lenghts of grep-command right,
but not find-command. The line is:

    (+ 22 (length grep-command))))))))

Best regards,
-Marcus.

Re: compile.el, using grep-find when find-program is not "find"

[Kevin Rodgers]

Marcus Picasso wrote:

> In GNU Emacs 21.3.1 (i386-msvc-nt5.0.2195) of 2003-03-28 on buffy:
> 
> Changing the lisp variable "find-program" to something else than "find"
> makes compile.el position the point at wrong place, when doing "M-x
> grep-find".
> 
> Hint:
> 
> Compile.el has in "grep-compute-defaults" a line which I think takes care of
> point-positioning, and it handles different lenghts of grep-command right,
> but not find-command. The line is:
> 
>     (+ 22 (length grep-command))))))))

22 is the position of grep-command in grep-find-command if find-program has its
default value of "find" (and grep-find-use-args is null).  Here's a patch:

2003-11-06  Kevin Rodgers  <ihs_4664@yahoo.com>

	* progmodes/compile.el (grep-compute-defaults): Don't guess the position
	  of grep-command by assuming find-program has its default value.


*** emacs-21.3/lisp/progmodes/compile.el.orig	Fri Jan 17 06:45:11 2003
--- emacs-21.3/lisp/progmodes/compile.el	Thu Nov  6 10:54:56 2003
***************
*** 94,103 ****
   		(grep-find-use-xargs
   		 (format "%s . -type f -print | xargs %s"
                            find-program grep-command))
! 		(t (cons (format "%s . -type f -exec %s {} %s \\;"
! 	 
		 find-program grep-command null-device)
! 	 
	 (+ 22 (length grep-command))))))))

   (defcustom grep-command nil
     "The default grep command for \\[grep].
   The default value of this variable is set up by `grep-compute-defaults';
--- 94,107 ----
   		(grep-find-use-xargs
   		 (format "%s . -type f -print | xargs %s"
                            find-program grep-command))
! 		(t (let ((command
!                           (format "%s . -type f -exec %s {} %s \\;"
!                                   find-program grep-command null-device)))

+                      (cons command
+                            (1+ (string-match (regexp-quote grep-command)
+                                              command)))))))))
+
   (defcustom grep-command nil
     "The default grep command for \\[grep].
   The default value of this variable is set up by `grep-compute-defaults';

-- 
Kevin Rodgers

Re: compile.el, using grep-find when find-program is not "find"

[Richard Stallman]

Does this patch give correct behavior?

*** compile.el.~1.281.~	Fri Oct 10 00:22:02 2003
--- compile.el	Sat Nov  8 16:53:54 2003
***************
*** 752,760 ****
  		(grep-find-use-xargs
  		 (format "%s . -type f -print | xargs %s"
                           find-program grep-command))
! 		(t (cons (format "%s . -type f -exec %s {} %s \\;"
! 				 find-program grep-command null-device)
! 			 (+ 22 (length grep-command)))))))
    (unless grep-tree-command
      (setq grep-tree-command
  	  (let* ((glen (length grep-program))
--- 752,765 ----
  		(grep-find-use-xargs
  		 (format "%s . -type f -print | xargs %s"
                           find-program grep-command))
! 		(t (let ((beginning 
! 			  (format "%s . -type f -exec " find-program))
! 			 (end
! 			  (format "%s {} %s \\;"
! 				 grep-command null-device)))
! 		     (cons
! 		      (concat beginning end)
! 		      (length beginning)))))))
    (unless grep-tree-command
      (setq grep-tree-command
  	  (let* ((glen (length grep-program))