Arch-tags shouldn't be outline headers.

[gnu-emacs] / lisp / progmodes / executable.el

diff --git a/lisp/progmodes/executable.el b/lisp/progmodes/executable.el
index bfe860fb22372db83d5395f51cae15f2eedb2148..a5d401a5f5e8ec969c1c633780a865a60246c63a 100644 (file)
--- a/lisp/progmodes/executable.el
+++ b/lisp/progmodes/executable.el
@@ -1,6 +1,6 @@
 ;;; executable.el --- base functionality for executable interpreter scripts -*- byte-compile-dynamic: t -*-
 
-;; Copyright (C) 1994, 1995, 1996, 2000 by Free Software Foundation, Inc.
+;; Copyright (C) 1994, 1995, 1996, 2000, 2003, 2004 by Free Software Foundation, Inc.
 
 ;; Author: Daniel Pfeiffer <occitan@esperanto.org>
 ;; Keywords: languages, unix
@@ -138,21 +138,39 @@ This can be included in `font-lock-keywords' by modes that call `executable'.")
 See `compilation-error-regexp-alist'.")
 
 ;; The C function openp slightly modified would do the trick fine
-(defvar executable-binary-suffixes
-  (if (memq system-type '(ms-dos windows-nt))
-      '(".exe" ".com" ".bat" ".cmd" ".btm" "")
-    '("")))
+(defvaralias 'executable-binary-suffixes 'exec-suffixes)
+
+;;;###autoload
+(defun executable-command-find-posix-p (&optional program)
+  "Check if PROGRAM handles arguments Posix-style.
+If PROGRAM is non-nil, use that instead of \"find\"."
+  ;;  Pick file to search from location we know
+  (let* ((dir (file-truename data-directory))
+         (file (car (directory-files dir nil "^[^.]"))))
+    (with-temp-buffer
+      (call-process (or program "find")
+                    nil
+                    (current-buffer)
+                    nil
+                    dir
+                    "-name"
+                    file
+                    "-maxdepth"
+                    "1")
+        (goto-char (point-min))
+        (if (search-forward file nil t)
+            t))))
 
 ;;;###autoload
 (defun executable-find (command)
-  "Search for COMMAND in exec-path and return the absolute file name.
+  "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 executable-binary-suffixes)
+                    (let ((suffixes exec-suffixes)
                           candidate)
                       (while suffixes
                         (setq candidate (concat file (car suffixes)))
@@ -230,35 +248,28 @@ executable."
       (not (or insert-flag executable-insert))
       (> (point-min) 1)
       (save-excursion
-       (let ((point (point-marker))
-             (buffer-modified-p (buffer-modified-p)))
-         (goto-char (point-min))
-         (make-local-hook 'after-save-hook)
-         (add-hook 'after-save-hook 'executable-chmod nil t)
-         (if (looking-at "#![ \t]*\\(.*\\)$")
-             (and (goto-char (match-beginning 1))
-                  ;; If the line ends in a space,
-                  ;; don't offer to change it.
-                  (not (= (char-after (1- (match-end 1))) ?\ ))
-                  (not (string= argument
-                                (buffer-substring (point) (match-end 1))))
-                  (if (or (not executable-query) no-query-flag
-                          (save-window-excursion
-                            ;; Make buffer visible before question.
-                            (switch-to-buffer (current-buffer))
-                            (y-or-n-p (concat "Replace magic number by `"
-                                              executable-prefix argument "'? "))))
-                      (progn
-                        (replace-match argument t t nil 1)
-                        (message "Magic number changed to `%s'"
-                                 (concat executable-prefix argument)))))
-           (insert executable-prefix argument ?\n)
-           (message "Magic number changed to `%s'"
-                    (concat executable-prefix argument)))
-;;;      (or insert-flag
-;;;          (eq executable-insert t)
-;;;          (set-buffer-modified-p buffer-modified-p))
-         )))
+       (goto-char (point-min))
+       (add-hook 'after-save-hook 'executable-chmod nil t)
+       (if (looking-at "#![ \t]*\\(.*\\)$")
+           (and (goto-char (match-beginning 1))
+                ;; If the line ends in a space,
+                ;; don't offer to change it.
+                (not (= (char-after (1- (match-end 1))) ?\ ))
+                (not (string= argument
+                              (buffer-substring (point) (match-end 1))))
+                (if (or (not executable-query) no-query-flag
+                        (save-window-excursion
+                          ;; Make buffer visible before question.
+                          (switch-to-buffer (current-buffer))
+                          (y-or-n-p (concat "Replace magic number by `"
+                                            executable-prefix argument "'? "))))
+                    (progn
+                      (replace-match argument t t nil 1)
+                      (message "Magic number changed to `%s'"
+                               (concat executable-prefix argument)))))
+         (insert executable-prefix argument ?\n)
+         (message "Magic number changed to `%s'"
+                  (concat executable-prefix argument)))))
     interpreter)
 
 
@@ -280,7 +291,7 @@ file modes."
   (and (>= (buffer-size) 2)
        (save-restriction
         (widen)
-        (string= "#!" (buffer-substring 1 3)))
+        (string= "#!" (buffer-substring (point-min) (+ 2 (point-min)))))
        (let* ((current-mode (file-modes (buffer-file-name)))
               (add-mode (logand ?\111 (default-file-modes))))
          (or (/= (logand ?\111 current-mode) 0)
@@ -290,4 +301,5 @@ file modes."
 
 (provide 'executable)
 
+;;; arch-tag: 58458d1c-d9db-45ec-942b-8bbb1d5e319d
 ;;; executable.el ends here