Changeset 4030

Timestamp:

2006年02月03日 17時46分43秒 (3 years ago)

Author:

shirai

Message:

* international/mw32script.el
(mw32script-file-executable-p): Add dos-string.
(mw32script-original-executable-find): New variable.
(mw32script-executable-find): New function.
(mw32script-init): Substitute `executable-find' to
`mw32script-executable-find' and tiny fix.

Files:

• trunk/lisp/ChangeLog.Meadow (modified) (1 diff)
• trunk/lisp/international/mw32script.el (modified) (3 diffs)

trunk/lisp/ChangeLog.Meadow

@@ +1 @@
+2006-02-03  Hideyuki SHIRAI  <shirai@meadowy.org>
+
+        * international/mw32script.el
+        (mw32script-file-executable-p): Add dos-string.
+        (mw32script-original-executable-find): New variable.
+        (mw32script-executable-find): New function.
+        (mw32script-init): Substitute `executable-find' to
+        `mw32script-executable-find' and tiny fix.
+
-2006-02-03  Masayuki FUJII  <boochang@m4.kcn.ne.jp>
-

trunk/lisp/international/mw32script.el

@@ -35 +35 @@
-(defvar mw32script-recursive nil)
-(defvar mw32script-original-file-executable-p nil)
+(defvar mw32script-original-executable-find nil)
-;; end --- options
-(defvar mw32script-bufsiz 256)
@@ -174 +175 @@
-
-(defun mw32script-file-executable-p (filename)
+  "Return t if filename can be executed by you.
+For a directory, this means you can access files in that directory.
+
+Add an analytical capability of the script file to this function by Meadow."
-  (or (funcall mw32script-original-file-executable-p filename)
-      (and (mw32script-resolve-script filename)
-           t)))
+
+(defun mw32script-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'.
+
+Add an analytical capability of the script file to this function by Meadow."
+  (catch 'detect
+    (let ((paths exec-path)
+          (suffixes exec-suffixes)
+          cmds names path file)
+      (while suffixes
+        (setq cmds (cons (concat command (car suffixes)) cmds))
+        (setq suffixes (cdr suffixes)))
+      (setq cmds (nreverse cmds))
+      (while (setq path (car paths))
+        (setq paths (cdr paths))
+        (setq names cmds)
+        (while names
+          (setq file (locate-file-internal (car names) (list path)))
+          (when (and file
+                     (not (file-directory-p file))
+                     (mw32script-file-executable-p file))
+            (throw 'detect file))
+          (setq names (cdr names)))))))
-
-(defun mw32script-init ()
@@ -185 +214 @@
-    (function mw32script-argument-editing-function) 'last)
-  (add-to-list 'exec-suffix-list "")
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-(provide 'mw32script)