From mboxrd@z Thu Jan 1 00:00:00 1970 Path: main.gmane.org!not-for-mail From: jari.aalto@poboxes.com (Jari Aalto+mail.linux) Newsgroups: gmane.emacs.bugs Subject: [patch] 21.3 filecache.el - Use executable.el executable-command-find-unix-p Date: Tue, 27 Jan 2004 15:10:54 +0200 Organization: Private Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Message-ID: NNTP-Posting-Host: deer.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: sea.gmane.org 1075209830 13952 80.91.224.253 (27 Jan 2004 13:23:50 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Tue, 27 Jan 2004 13:23:50 +0000 (UTC) Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Tue Jan 27 14:23:41 2004 Return-path: Original-Received: from monty-python.gnu.org ([199.232.76.173]) by deer.gmane.org with esmtp (Exim 3.35 #1 (Debian)) id 1AlTBs-0004sq-00 for ; Tue, 27 Jan 2004 14:23:40 +0100 Original-Received: from localhost ([127.0.0.1] helo=monty-python.gnu.org) by monty-python.gnu.org with esmtp (Exim 4.24) id 1AlT8f-0007nS-Kx for geb-bug-gnu-emacs@m.gmane.org; Tue, 27 Jan 2004 08:20:21 -0500 Original-Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24) id 1AlT8c-0007mj-W3 for bug-gnu-emacs@prep.ai.mit.edu; Tue, 27 Jan 2004 08:20:18 -0500 Original-Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24) id 1AlT86-0007h2-8Y for bug-gnu-emacs@prep.ai.mit.edu; Tue, 27 Jan 2004 08:20:18 -0500 Original-Received: from [216.168.1.22] (helo=trinity.supernews.net) by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168) (Exim 4.24) id 1AlSp1-0005Ee-EQ for bug-gnu-emacs@prep.ai.mit.edu; Tue, 27 Jan 2004 08:00:03 -0500 Original-Received: from smtp34.kolumbus.fi ([193.229.0.38]:25828) by trinity.supernews.net with esmtp (Exim 4.24; FreeBSD) id 1AlSoz-000OJ1-U3 for gnu-emacs-bug@moderators.isc.org; Tue, 27 Jan 2004 13:00:02 +0000 Original-Received: from news.kolumbus.fi (news.kolumbus.fi [193.229.0.31]) by smtp34.kolumbus.fi (8.12.10/8.12.4) with ESMTP id i0RCxrWA023807 for ; Tue, 27 Jan 2004 14:59:53 +0200 (EET) Original-Received: (from news@localhost) by news.kolumbus.fi (8.11.6+Sun/8.11.6) id i0RCxqO29839 for gnu-emacs-bug@moderators.isc.org; Tue, 27 Jan 2004 14:59:52 +0200 (EET) Original-To: gnu-emacs-bug@moderators.isc.org Original-Path: not-for-mail Original-Newsgroups: gnu.emacs.bug Original-Lines: 82 Original-NNTP-Posting-Host: a110t7.elisa.omakaista.fi Original-X-Trace: phys-news1.kolumbus.fi 1075208392 28301 81.197.3.110 (27 Jan 2004 12:59:52 GMT) Original-X-Complaints-To: abuse@kolumbus.fi Original-NNTP-Posting-Date: Tue, 27 Jan 2004 12:59:52 +0000 (UTC) User-Agent: Gnus/5.1003 (Gnus v5.10.3) Emacs/20.7 (windows-nt) (i386-*-nt5.0.2195) Cancel-Lock: sha1:rZFMwWL2ta+gmiqsLZbA9QKHu6I= X-BeenThere: bug-gnu-emacs@gnu.org X-Mailman-Version: 2.1.2 Precedence: list List-Id: Bug reports for GNU Emacs, the Swiss army knife of text editors List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: main.gmane.org gmane.emacs.bugs:6788 X-Report-Spam: http://spam.gmane.org/gmane.emacs.bugs:6788 This patch supposes, that executable.el has been patched for new function. 2004-01-27 Jari Aalto * filecache.el (top level): Added autoload for `executable-command-find-unix-p' (file-cache-find-unix-p): Removed. Moved to executable.el (file-cache-add-directory-using-find): Use `executable-command-find-unix-p' Index: filecache.el =================================================================== RCS file: /cygdrive/h/data/version-control/cvsroot/emacs/gnu-emacs/lisp213/filecache.el,v retrieving revision 1.7 retrieving revision 1.8 diff -u -IId: -b -w -u -r1.7 -r1.8 --- filecache.el 26 Jan 2004 19:16:23 -0000 1.7 +++ filecache.el 27 Jan 2004 13:07:32 -0000 1.8 @@ -139,6 +139,8 @@ ;;; Code: +(autoload 'executable-command-find-unix-p "executable") + (defgroup file-cache nil "Find files using a pre-loaded cache." :group 'files @@ -327,36 +329,14 @@ file-cache-alist))) ))) -(defun file-cache-find-unix-p () - "Check if `file-cache-find-command' is Unix type program." - ;; Pick file to search from location we know - (let* ((dir (car load-path)) - (file (find-if - (lambda (x) - ;; Filter directories . and .. - (not (string-match "^\\.\\.?$" x))) - (directory-files dir)))) - (with-temp-buffer - (call-process file-cache-find-command - nil - (current-buffer) - nil - dir - "-name" - file - "-maxdepth" - "1") - (goto-char (point-min)) - (if (search-forward file nil t) - t)))) - (defun file-cache-add-directory-using-find (directory) "Use the `find' command to add files to the file cache. Find is run in DIRECTORY." (interactive "DAdd files under directory: ") (let ((dir (expand-file-name directory))) (if (eq file-cache-find-command-unix-flag 'not-defined) - (setq file-cache-find-command-unix-flag (file-cache-find-unix-p))) + (setq file-cache-find-command-unix-flag + (executable-command-find-unix-p file-cache-find-command))) (set-buffer (get-buffer-create file-cache-buffer)) (erase-buffer) (call-process file-cache-find-command nil -- http://tiny-tools.sourceforge.net/ Swatch @time http://www.mir.com.my/iTime/itime.htm http://www.ryanthiessen.com/swatch/resources.htm Use Licenses! http://www.linuxjournal.com/article.php?sid=6225 Which Licence? http://www.linuxjournal.com/article.php?sid=4825 OSI Licences http://www.opensource.org/licenses/