emacs: lisp/progmodes/grep.el comparison

comparison lisp/progmodes/grep.el @ 90984:a1be62cbd32a

Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 814-815) - Update from CVS Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-232

author	Miles Bader <miles@gnu.org>
date	Wed, 18 Jul 2007 22:15:15 +0000
parents	4ef881a120fe 7447c9b7efeb
children	492971a3f31f

comparison

equal deleted inserted replaced

-:8cdd8b5fa891
+:a1be62cbd32a
 	   (cons msg code))))
 (run-hooks 'grep-setup-hook))
 (defun grep-probe (command args &optional func result)
 (equal (condition-case nil
-	     (apply (or func 'call-process) command args)
+	     (apply (or func 'process-file) command args)
 	   (error nil))
 	 (or result 0)))
 ;;;###autoload
 (defun grep-compute-defaults ()
-(unless (or (not grep-use-null-device) (eq grep-use-null-device t))
+(let ((host-id
-(setq grep-use-null-device
+	 (intern (or (file-remote-p default-directory 'host) "localhost"))))
-	  (with-temp-buffer
+;; There are different defaults on different hosts.  They must be
-	    (let ((hello-file (expand-file-name "HELLO" data-directory)))
+;; computed for every host once, then they are kept in the
-	      (not
+;; variables' property host-id for reuse.
-	       (and (if grep-command
+(setq grep-command
-			;; `grep-command' is already set, so
+	  (or (get 'grep-command host-id)
-			;; use that for testing.
+	      (eval (car (get 'grep-command 'standard-value))))
-			(grep-probe grep-command
-				    `(nil t nil "^English" ,hello-file)
+	  grep-template
-				    #'call-process-shell-command)
+(or (get 'grep-template host-id)
-		      ;; otherwise use `grep-program'
+	      (eval (car (get 'grep-template 'standard-value))))
-		      (grep-probe grep-program
-				  `(nil t nil "-nH" "^English" ,hello-file)))
+	  grep-use-null-device
-		    (progn
+	  (or (get 'grep-use-null-device host-id)
-		      (goto-char (point-min))
+	      (eval (car (get 'grep-use-null-device 'standard-value))))
-		      (looking-at
-		       (concat (regexp-quote hello-file)
+	  grep-find-command
-			       ":[0-9]+:English")))))))))
+	  (or (get 'grep-find-command host-id)
-(unless (and grep-command grep-find-command
+	      (eval (car (get 'grep-find-command 'standard-value))))
-	       grep-template grep-find-template)
-(let ((grep-options
+	  grep-find-template
-	   (concat (if grep-use-null-device "-n" "-nH")
+	  (or (get 'grep-find-template host-id)
-		   (if (grep-probe grep-program
+	      (eval (car (get 'grep-find-template 'standard-value))))
-				   `(nil nil nil "-e" "foo" ,null-device)
-				   nil 1)
+	  grep-find-use-xargs
-		       " -e"))))
+	  (or (get 'grep-find-use-xargs host-id)
-(unless grep-command
+	      (eval (car (get 'grep-find-use-xargs 'standard-value))))
-	(setq grep-command
-	      (format "%s %s " grep-program grep-options)))
+	  grep-highlight-matches
-(unless grep-template
+	  (or (get 'grep-highlight-matches host-id)
-	(setq grep-template
+	      (eval (car (get 'grep-highlight-matches 'standard-value)))))
-	      (format "%s <C> %s <R> <F>" grep-program grep-options)))
-(unless grep-find-use-xargs
+(unless (or (not grep-use-null-device) (eq grep-use-null-device t))
-	(setq grep-find-use-xargs
+(setq grep-use-null-device
-	      (cond
+	    (with-temp-buffer
-	       ((and
+	      (let ((hello-file (expand-file-name "HELLO" data-directory)))
-		 (grep-probe find-program `(nil nil nil ,null-device "-print0"))
+		(not
-		 (grep-probe "xargs" `(nil nil nil "-0" "-e" "echo")))
+		 (and (if grep-command
-		'gnu)
+			  ;; `grep-command' is already set, so
-	       (t
+			  ;; use that for testing.
-		'exec))))
+			  (grep-probe grep-command
-(unless grep-find-command
+				      `(nil t nil "^English" ,hello-file)
-	(setq grep-find-command
+				      #'call-process-shell-command)
-	      (cond ((eq grep-find-use-xargs 'gnu)
+			;; otherwise use `grep-program'
-		     (format "%s . -type f -print0 | xargs -0 -e %s"
+			(grep-probe grep-program
-			     find-program grep-command))
+				    `(nil t nil "-nH" "^English" ,hello-file)))
-		    ((eq grep-find-use-xargs 'exec)
+		      (progn
-		     (let ((cmd0 (format "%s . -type f -exec %s"
+			(goto-char (point-min))
-					 find-program grep-command)))
+			(looking-at
-		       (cons
+			 (concat (regexp-quote hello-file)
-			(format "%s {} %s %s"
+				 ":[0-9]+:English")))))))))
-				cmd0 null-device
+(unless (and grep-command grep-find-command
-				(shell-quote-argument ";"))
+		 grep-template grep-find-template)
-			(1+ (length cmd0)))))
+(let ((grep-options
-		    (t
+	     (concat (if grep-use-null-device "-n" "-nH")
-		     (format "%s . -type f -print | xargs %s"
+		     (if (grep-probe grep-program
-			     find-program grep-command)))))
+				     `(nil nil nil "-e" "foo" ,null-device)
-(unless grep-find-template
+				     nil 1)
-	(setq grep-find-template
+			 " -e"))))
-	      (let ((gcmd (format "%s <C> %s <R>"
+	(unless grep-command
-				  grep-program grep-options)))
+	  (setq grep-command
+		(format "%s %s " grep-program grep-options)))
+	(unless grep-template
+	  (setq grep-template
+		(format "%s <C> %s <R> <F>" grep-program grep-options)))
+	(unless grep-find-use-xargs
+	  (setq grep-find-use-xargs
+		(cond
+		 ((and
+		   (grep-probe find-program `(nil nil nil ,null-device "-print0"))
+		   (grep-probe "xargs" `(nil nil nil "-0" "-e" "echo")))
+		  'gnu)
+		 (t
+		  'exec))))
+	(unless grep-find-command
+	  (setq grep-find-command
 		(cond ((eq grep-find-use-xargs 'gnu)
-		       (format "%s . <X> -type f <F> -print0 | xargs -0 -e %s"
+		       (format "%s . -type f -print0 | xargs -0 -e %s"
-			       find-program gcmd))
+			       find-program grep-command))
 		      ((eq grep-find-use-xargs 'exec)
-		       (format "%s . <X> -type f <F> -exec %s {} %s %s"
+		       (let ((cmd0 (format "%s . -type f -exec %s"
-			       find-program gcmd null-device
+					   find-program grep-command)))
-			       (shell-quote-argument ";")))
+			 (cons
+			  (format "%s {} %s %s"
+				  cmd0 null-device
+				  (shell-quote-argument ";"))
+			  (1+ (length cmd0)))))
 		      (t
-		       (format "%s . <X> -type f <F> -print | xargs %s"
+		       (format "%s . -type f -print | xargs %s"
-			       find-program gcmd))))))))
+			       find-program grep-command)))))
-(unless (or (not grep-highlight-matches) (eq grep-highlight-matches t))
+	(unless grep-find-template
-(setq grep-highlight-matches
+	  (setq grep-find-template
-	  (with-temp-buffer
+		(let ((gcmd (format "%s <C> %s <R>"
-	    (and (grep-probe grep-program '(nil t nil "--help"))
+				    grep-program grep-options)))
-		 (progn
+		  (cond ((eq grep-find-use-xargs 'gnu)
-		   (goto-char (point-min))
+			 (format "%s . <X> -type f <F> -print0 | xargs -0 -e %s"
-		   (search-forward "--color" nil t))
+				 find-program gcmd))
-		 t)))))
+			((eq grep-find-use-xargs 'exec)
+			 (format "%s . <X> -type f <F> -exec %s {} %s %s"
+				 find-program gcmd null-device
+				 (shell-quote-argument ";")))
+			(t
+			 (format "%s . <X> -type f <F> -print | xargs %s"
+				 find-program gcmd))))))))
+(unless (or (not grep-highlight-matches) (eq grep-highlight-matches t))
+(setq grep-highlight-matches
+	    (with-temp-buffer
+	      (and (grep-probe grep-program '(nil t nil "--help"))
+		   (progn
+		     (goto-char (point-min))
+		     (search-forward "--color" nil t))
+		   t))))
+;; Save defaults for this host.
+(put 'grep-command host-id grep-command)
+(put 'grep-template host-id grep-template)
+(put 'grep-use-null-device host-id grep-use-null-device)
+(put 'grep-find-command host-id grep-find-command)
+(put 'grep-find-template host-id grep-find-template)
+(put 'grep-find-use-xargs host-id grep-find-use-xargs)
+(put 'grep-highlight-matches host-id grep-highlight-matches)))
 (defun grep-tag-default ()
 (or (and transient-mark-mode mark-active
 	   (/= (point) (mark))
 	   (buffer-substring-no-properties (point) (mark)))

Mercurial > emacs

comparison lisp/progmodes/grep.el @ 90984:a1be62cbd32a