diff options
| author | Gerd Moellmann | 2001-08-07 09:47:06 +0000 |
|---|---|---|
| committer | Gerd Moellmann | 2001-08-07 09:47:06 +0000 |
| commit | 6c233cc08319a7a6d7bea4f0e3bc31077a25b394 (patch) | |
| tree | ad696bfc312882f5dae837a85c8ca92e7b77d40a /lisp/progmodes/executable.el | |
| parent | 1155d48351e6badb1bf27658ccbda38d5f5d6fd6 (diff) | |
| download | emacs-6c233cc08319a7a6d7bea4f0e3bc31077a25b394.tar.gz emacs-6c233cc08319a7a6d7bea4f0e3bc31077a25b394.zip | |
(executable-set-magic): If
executable-find returns a quoted file name, unquote it before
inserting it.
Diffstat (limited to 'lisp/progmodes/executable.el')
| -rw-r--r-- | lisp/progmodes/executable.el | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/lisp/progmodes/executable.el b/lisp/progmodes/executable.el index ce2b0b68cbb..bfe860fb223 100644 --- a/lisp/progmodes/executable.el +++ b/lisp/progmodes/executable.el | |||
| @@ -210,13 +210,19 @@ executable." | |||
| 210 | (let* ((name (read-string "Name or file name of interpreter: ")) | 210 | (let* ((name (read-string "Name or file name of interpreter: ")) |
| 211 | (arg (read-string (format "Argument for %s: " name)))) | 211 | (arg (read-string (format "Argument for %s: " name)))) |
| 212 | (list name arg (eq executable-query 'function) t))) | 212 | (list name arg (eq executable-query 'function) t))) |
| 213 | |||
| 213 | (setq interpreter (if (file-name-absolute-p interpreter) | 214 | (setq interpreter (if (file-name-absolute-p interpreter) |
| 214 | interpreter | 215 | interpreter |
| 215 | (or (executable-find interpreter) | 216 | (or (executable-find interpreter) |
| 216 | (error "Interpreter %s not recognized" interpreter))) | 217 | (error "Interpreter %s not recognized" |
| 217 | argument (concat interpreter | 218 | interpreter)))) |
| 219 | |||
| 220 | (setq argument (concat (if (string-match "\\`/:" interpreter) | ||
| 221 | (replace-match "" nil nil interpreter) | ||
| 222 | interpreter) | ||
| 218 | (and argument (string< "" argument) " ") | 223 | (and argument (string< "" argument) " ") |
| 219 | argument)) | 224 | argument)) |
| 225 | |||
| 220 | (or buffer-read-only | 226 | (or buffer-read-only |
| 221 | (if buffer-file-name | 227 | (if buffer-file-name |
| 222 | (string-match executable-magicless-file-regexp | 228 | (string-match executable-magicless-file-regexp |
| @@ -253,7 +259,7 @@ executable." | |||
| 253 | ;;; (eq executable-insert t) | 259 | ;;; (eq executable-insert t) |
| 254 | ;;; (set-buffer-modified-p buffer-modified-p)) | 260 | ;;; (set-buffer-modified-p buffer-modified-p)) |
| 255 | ))) | 261 | ))) |
| 256 | interpreter) | 262 | interpreter) |
| 257 | 263 | ||
| 258 | 264 | ||
| 259 | 265 | ||