CVS update by michaels packages/xemacs-packages/igrep ...

[xemacs-cvs at xemacs.org]

  User: michaels
  Date: 07/08/21 14:44:28

  Modified:    packages/xemacs-packages/igrep ChangeLog igrep.el
Log:
2007-08-21  Mike Sperber  <mike at xemacs.org>

	* igrep.el: Synch with igrep 2.113.

Revision  Changes    Path
1.21      +4 -0      XEmacs/packages/xemacs-packages/igrep/ChangeLog

Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/igrep/ChangeLog,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- ChangeLog	2005/12/05 06:19:32	1.20
+++ ChangeLog	2007/08/21 12:44:26	1.21
@@ -1,3 +1,7 @@
+2007-08-21  Mike Sperber  <mike at xemacs.org>
+
+	* igrep.el: Synch with igrep 2.113.
+
 2005-12-05  Norbert Koch  <viteno at xemacs.org>
 
 	* Makefile (VERSION): XEmacs package 1.14 released.



1.10      +28 -18    XEmacs/packages/xemacs-packages/igrep/igrep.el

Index: igrep.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/igrep/igrep.el,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- igrep.el	2005/12/04 15:46:18	1.9
+++ igrep.el	2007/08/21 12:44:26	1.10
@@ -1,13 +1,13 @@
 ;;; igrep.el --- An improved interface to `grep` and `find`
-;;; -*-unibyte: t;-*-
+;;; -*-coding: iso-latin-1;-*-
 
-;; Copyright © 1993-1998,2000-2004 Kevin Rodgers
+;; Copyright © 1993-1998,2000-2005 Kevin Rodgers
 
 ;; Author: Kevin Rodgers <ihs_4664 at yahoo.com>
 ;; Created:  22 Jun 1993
-;; Version: 2.111
+;; Version: 2.113
 ;; Keywords: tools, processes, search
-;; SCCS: @(#)igrep.el	2.111
+;; SCCS: @(#)igrep.el	2.113
 
 ;; This program is free software; you can redistribute it and/or
 ;; modify it under the terms of the GNU General Public License as
@@ -189,7 +189,7 @@
 (require 'easymenu)			; easy-menu-define, easy-menu-add-item
 
 (or (condition-case nil
-	(require 'grep)			; CVS Emacs (21.3.50/21.4)
+	(require 'grep)			; Emacs 22
       (error nil))
     (require 'compile))			; compile-internal, grep-regexp-alist,
 					; grep-null-device
@@ -210,7 +210,7 @@
 	(error nil)))
   )
 
-(defconst igrep-version "2.111"
+(defconst igrep-version "2.113"
   "This version of igrep.el.")
 
 (defgroup igrep nil
@@ -339,7 +339,9 @@ See `easy-menu-define'."
       (vector name callback)
     (vector name callback help-keyword help-text)))
 
-(defvar:help ':help)			; Emacs 19
+(eval-when-compile
+  (unless (and (fboundp 'keywordp) (keywordp :help))
+    (defvar :help ':help)))             ; Emacs 19
 
 (defvar igrep-easy-menu
   `("Search Files and Directories (igrep)"
@@ -425,7 +427,7 @@ See `igrep-find'.")
   (if (equal (call-process igrep-find-program nil nil nil
 			   igrep-null-device "-prune")
 	     0)
-      (format "-type d %s -name RCS -o -name CVS -o -name .svn -o -name SCCS %s"
+      (format "-type d %s -name RCS -o -name CVS -o -name SCCS -name .svn %s"
 	      (shell-quote-argument "(")
 	      (shell-quote-argument ")")))
   "The `find` clause used to prune directories, or nil;
@@ -445,15 +447,11 @@ see `igrep-find'.")
 see `igrep-find'.")
 
 (defvar igrep-find-use-xargs
-  (cond ((and (equal (call-process igrep-find-program nil nil nil
-				   igrep-null-device "-print0")
-		     0)
-	      (equal (call-process "xargs" nil nil nil
-				   "-e" "-0" "cat")
-		     0))
+  (cond ((equal (call-process igrep-find-program nil nil nil
+                              igrep-null-device "-print0")
+                0)
 	 'gnu)
-	((equal (call-process "xargs" nil nil nil "-e") 0)
-	 t))
+        ((equal (call-process "xargs" nil nil nil "-e") 0)))
   "Whether `\\[igrep-find]' uses the `xargs` program or not.
 If `gnu', it executes
 	`find ... -print0 | xargs -0 -e grep ...`;
@@ -610,8 +608,20 @@ the file name component of FILES (and wh
 	      (igrep-format-find-command command files)))
     (cond ((eq igrep-save-buffers t) (save-some-buffers t))
 	  (igrep-save-buffers (save-some-buffers)))
-    (compile-internal command (format "No more %s matches" program)
-		      "igrep" nil grep-regexp-alist)))
+    (if (fboundp 'compilation-start)    ; Emacs 22
+        (let ((compilation-process-setup-function 'grep-process-setup))
+          (or (fboundp 'igrep-mode)
+              (define-derived-mode igrep-mode grep-mode "Igrep"))
+          (compilation-start command
+                             'igrep-mode
+                             nil
+                             (cond ((eq compilation-highlight-regexp t))
+                                   (compilation-highlight-regexp
+                                    (if (eq program "fgrep")
+                                        (regexp-quote regex)
+                                      regex)))))
+      (compile-internal command (format "No more %s matches" program)
+                        "Igrep" nil grep-regexp-alist))))
 
 ;; Analogue commands: