(executable-find): Move to files.el.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1ff0edac77f062aa5390b91b6cd2456915c18e4e..4efd990f145bdcc779e8def09dc74d9eec2ac836 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2005-05-11  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+       * files.el (executable-find): Move from executable.el. Use locate-file.
+       * progmodes/executable.el (executable-find): Move to files.el.
+
        * font-lock.el (font-lock-fontify-keywords-region): Use a marker
        when trying to ensure forward progress.
 
@@ -19,7 +22,7 @@
        * progmodes/sh-script.el (sh-indent-for-do): Default to 0.
 
        * progmodes/ada-mode.el (ada-adjust-case-skeleton):
-       Moved from ada-stmt.el.
+       Move from ada-stmt.el.
        (ada-mode): Add ada-adjust-case-skeleton to skeleton-end-hook.
 
        * progmodes/ada-stmt.el (ada-adjust-case-skeleton):

diff --git a/lisp/progmodes/executable.el b/lisp/progmodes/executable.el
index 0eb537710198c92bcfcc998745c254263391416c..d278b10ba0c542c7ecef43dc62906a4760adbace 100644 (file)
--- a/lisp/progmodes/executable.el
+++ b/lisp/progmodes/executable.el
@@ -161,30 +161,6 @@ If PROGRAM is non-nil, use that instead of \"find\"."
         (if (search-forward file nil t)
             t))))
 
-;;;###autoload
-(defun executable-find (command)
-  "Search for COMMAND in `exec-path' and return the absolute file name.
-Return nil if COMMAND is not found anywhere in `exec-path'."
-  (let ((list exec-path)
-       file)
-    (while list
-      (setq list
-           (if (and (setq file (expand-file-name command (car list)))
-                    (let ((suffixes exec-suffixes)
-                          candidate)
-                      (while suffixes
-                        (setq candidate (concat file (car suffixes)))
-                        (if (and (file-executable-p candidate)
-                                 (not (file-directory-p candidate)))
-                            (setq suffixes nil)
-                          (setq suffixes (cdr suffixes))
-                          (setq candidate nil)))
-                      (setq file candidate)))
-               nil
-             (setq file nil)
-             (cdr list))))
-    file))
-
 (defun executable-chmod ()
   "This gets called after saving a file to assure that it be executable.
 You can set the absolute or relative mode in variable `executable-chmod' for
@@ -301,5 +277,5 @@ file modes."
 
 (provide 'executable)
 
-;;; arch-tag: 58458d1c-d9db-45ec-942b-8bbb1d5e319d
+;; arch-tag: 58458d1c-d9db-45ec-942b-8bbb1d5e319d
 ;;; executable.el ends here