# HG changeset patch # User Stefan Monnier # Date 1053293843 0 # Node ID 52ad052cb31295002fc0ca424e0f81969e7abc9a # Parent af63282f9b8e83ff24882512eead19b53a85bcc0 (executable-set-magic): Remove unused vars `point' and `buffer-modified-p'. diff -r af63282f9b8e -r 52ad052cb312 lisp/progmodes/executable.el --- a/lisp/progmodes/executable.el Sun May 18 21:35:06 2003 +0000 +++ b/lisp/progmodes/executable.el Sun May 18 21:37:23 2003 +0000 @@ -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 by Free Software Foundation, Inc. ;; Author: Daniel Pfeiffer ;; Keywords: languages, unix @@ -227,34 +227,28 @@ (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)) - (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) @@ -276,7 +270,7 @@ (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)