diff options
| author | Juanma Barranquero | 2002-06-14 09:41:35 +0000 |
|---|---|---|
| committer | Juanma Barranquero | 2002-06-14 09:41:35 +0000 |
| commit | 5dee02a3fba2e09a7e9479e8f943ee9efa1fb821 (patch) | |
| tree | 21681c52cf705d23e205deeefe9afa7522052ba8 | |
| parent | cc1b792b06b2830b07a7666c3513f6d39b71810f (diff) | |
| download | emacs-5dee02a3fba2e09a7e9479e8f943ee9efa1fb821.tar.gz emacs-5dee02a3fba2e09a7e9479e8f943ee9efa1fb821.zip | |
(comint-snapshot-last-prompt): Bind `inhibit-read-only' to t to support
read-only prompts.
(comint-output-filter): Likewise.
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/comint.el | 16 |
2 files changed, 15 insertions, 7 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 47b0bbe8d1a..6f8eb87a388 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2002-06-14 Juanma Barranquero <lektu@terra.es> | ||
| 2 | |||
| 3 | * comint.el (comint-snapshot-last-prompt): Bind | ||
| 4 | `inhibit-read-only' to t to support read-only prompts. | ||
| 5 | (comint-output-filter): Likewise. | ||
| 6 | |||
| 1 | 2002-06-14 Miles Bader <miles@gnu.org> | 7 | 2002-06-14 Miles Bader <miles@gnu.org> |
| 2 | 8 | ||
| 3 | * subr.el (copy-tree): Use `nconc' and `nreverse' instead of `nreconc'. | 9 | * subr.el (copy-tree): Use `nconc' and `nreverse' instead of `nreconc'. |
diff --git a/lisp/comint.el b/lisp/comint.el index ea06ab4ac5f..6840e4d6c5a 100644 --- a/lisp/comint.el +++ b/lisp/comint.el | |||
| @@ -1535,9 +1535,10 @@ either globally or locally.") | |||
| 1535 | ;; prompt overlay. | 1535 | ;; prompt overlay. |
| 1536 | (defun comint-snapshot-last-prompt () | 1536 | (defun comint-snapshot-last-prompt () |
| 1537 | (when comint-last-prompt-overlay | 1537 | (when comint-last-prompt-overlay |
| 1538 | (add-text-properties (overlay-start comint-last-prompt-overlay) | 1538 | (let ((inhibit-read-only t)) |
| 1539 | (overlay-end comint-last-prompt-overlay) | 1539 | (add-text-properties (overlay-start comint-last-prompt-overlay) |
| 1540 | (overlay-properties comint-last-prompt-overlay)))) | 1540 | (overlay-end comint-last-prompt-overlay) |
| 1541 | (overlay-properties comint-last-prompt-overlay))))) | ||
| 1541 | 1542 | ||
| 1542 | (defun comint-carriage-motion (string) | 1543 | (defun comint-carriage-motion (string) |
| 1543 | "Handle carriage control characters in comint output. | 1544 | "Handle carriage control characters in comint output. |
| @@ -1661,10 +1662,11 @@ This function should be in the list `comint-output-filter-functions'." | |||
| 1661 | (set-marker (process-mark process) (point)) | 1662 | (set-marker (process-mark process) (point)) |
| 1662 | 1663 | ||
| 1663 | (unless comint-use-prompt-regexp-instead-of-fields | 1664 | (unless comint-use-prompt-regexp-instead-of-fields |
| 1664 | (add-text-properties comint-last-output-start (point) | 1665 | (let ((inhibit-read-only t)) |
| 1665 | '(rear-nonsticky t | 1666 | (add-text-properties comint-last-output-start (point) |
| 1666 | field output | 1667 | '(rear-nonsticky t |
| 1667 | inhibit-line-move-field-capture t))) | 1668 | field output |
| 1669 | inhibit-line-move-field-capture t)))) | ||
| 1668 | 1670 | ||
| 1669 | ;; Highlight the prompt, where we define `prompt' to mean | 1671 | ;; Highlight the prompt, where we define `prompt' to mean |
| 1670 | ;; the most recent output that doesn't end with a newline. | 1672 | ;; the most recent output that doesn't end with a newline. |