diff options
| author | Stefan Monnier | 2002-10-21 22:49:17 +0000 |
|---|---|---|
| committer | Stefan Monnier | 2002-10-21 22:49:17 +0000 |
| commit | 66f067937bc07860c3f3a3845c4e0f11febfbf25 (patch) | |
| tree | 6906fdc75dd45328f61908b4596ca7792019d5fe | |
| parent | 87b3b78a06600621062815a878d836ddeab9a14e (diff) | |
| download | emacs-66f067937bc07860c3f3a3845c4e0f11febfbf25.tar.gz emacs-66f067937bc07860c3f3a3845c4e0f11febfbf25.zip | |
(inferior-emacs-lisp-mode): If hexl not found, use cat. point-min != 1.
| -rw-r--r-- | lisp/ielm.el | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/lisp/ielm.el b/lisp/ielm.el index d2c015b18bd..5e8be90d797 100644 --- a/lisp/ielm.el +++ b/lisp/ielm.el | |||
| @@ -419,8 +419,8 @@ simply inserts a newline." | |||
| 419 | "Major mode for interactively evaluating Emacs Lisp expressions. | 419 | "Major mode for interactively evaluating Emacs Lisp expressions. |
| 420 | Uses the interface provided by `comint-mode' (which see). | 420 | Uses the interface provided by `comint-mode' (which see). |
| 421 | 421 | ||
| 422 | * \\<ielm-map>\\[ielm-send-input] evaluates the sexp following the prompt. There must be at most | 422 | * \\<ielm-map>\\[ielm-send-input] evaluates the sexp following the prompt. There must be at most |
| 423 | one top-level sexp per prompt. | 423 | one top level sexp per prompt. |
| 424 | 424 | ||
| 425 | * \\[ielm-return] inserts a newline and indents, or evaluates a | 425 | * \\[ielm-return] inserts a newline and indents, or evaluates a |
| 426 | complete expression (but see variable `ielm-dynamic-return'). | 426 | complete expression (but see variable `ielm-dynamic-return'). |
| @@ -499,7 +499,9 @@ Customised bindings may be defined in `ielm-map', which currently contains: | |||
| 499 | (unless (comint-check-proc (current-buffer)) | 499 | (unless (comint-check-proc (current-buffer)) |
| 500 | ;; Was cat, but on non-Unix platforms that might not exist, so | 500 | ;; Was cat, but on non-Unix platforms that might not exist, so |
| 501 | ;; use hexl instead, which is part of the Emacs distribution. | 501 | ;; use hexl instead, which is part of the Emacs distribution. |
| 502 | (start-process "ielm" (current-buffer) "hexl") | 502 | (condition-case nil |
| 503 | (start-process "ielm" (current-buffer) "hexl") | ||
| 504 | (file-error (start-process "ielm" (current-buffer) "cat"))) | ||
| 503 | (process-kill-without-query (ielm-process)) | 505 | (process-kill-without-query (ielm-process)) |
| 504 | (goto-char (point-max)) | 506 | (goto-char (point-max)) |
| 505 | 507 | ||
| @@ -512,7 +514,7 @@ Customised bindings may be defined in `ielm-map', which currently contains: | |||
| 512 | (ielm-set-pm (point-max)) | 514 | (ielm-set-pm (point-max)) |
| 513 | (unless comint-use-prompt-regexp-instead-of-fields | 515 | (unless comint-use-prompt-regexp-instead-of-fields |
| 514 | (add-text-properties | 516 | (add-text-properties |
| 515 | 1 (point-max) | 517 | (point-min) (point-max) |
| 516 | '(rear-nonsticky t field output inhibit-line-move-field-capture t))) | 518 | '(rear-nonsticky t field output inhibit-line-move-field-capture t))) |
| 517 | (comint-output-filter (ielm-process) ielm-prompt) | 519 | (comint-output-filter (ielm-process) ielm-prompt) |
| 518 | (set-marker comint-last-input-start (ielm-pm)) | 520 | (set-marker comint-last-input-start (ielm-pm)) |