diff options
| author | Wolfgang Jenkner | 2015-04-17 19:54:35 +0200 |
|---|---|---|
| committer | Wolfgang Jenkner | 2015-04-17 19:56:41 +0200 |
| commit | 4841a2d8aae1b7b2aa4bda6cf16c1be11d5b132a (patch) | |
| tree | 584e74df0620964653ebbad96cdbdacbbe01458f | |
| parent | 1c565a24acc8409e7415fe6daf74d87476987183 (diff) | |
| download | emacs-4841a2d8aae1b7b2aa4bda6cf16c1be11d5b132a.tar.gz emacs-4841a2d8aae1b7b2aa4bda6cf16c1be11d5b132a.zip | |
Fix fontification of keywords clobbered by the prompt.
* lisp/comint.el (comint-output-filter): Remove the uses of
with-silent-modifications I introduced as part of the last change.
This fixes, e.g., erratically missing highlighting when running
./configure --help; ./configure in a shell-mode buffer with
compilation-shell-minor-mode turned on.
| -rw-r--r-- | lisp/comint.el | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/lisp/comint.el b/lisp/comint.el index 2769c8717d2..de220619751 100644 --- a/lisp/comint.el +++ b/lisp/comint.el | |||
| @@ -2082,19 +2082,19 @@ Make backspaces delete the previous character." | |||
| 2082 | (add-text-properties prompt-start (point) | 2082 | (add-text-properties prompt-start (point) |
| 2083 | '(read-only t front-sticky (read-only))))) | 2083 | '(read-only t front-sticky (read-only))))) |
| 2084 | (when comint-last-prompt | 2084 | (when comint-last-prompt |
| 2085 | (with-silent-modifications | 2085 | ;; There might be some keywords here waiting for |
| 2086 | (font-lock--remove-face-from-text-property | 2086 | ;; fontification, so no `with-silent-modifications'. |
| 2087 | (car comint-last-prompt) | 2087 | (font-lock--remove-face-from-text-property |
| 2088 | (cdr comint-last-prompt) | 2088 | (car comint-last-prompt) |
| 2089 | 'font-lock-face | 2089 | (cdr comint-last-prompt) |
| 2090 | 'comint-highlight-prompt))) | 2090 | 'font-lock-face |
| 2091 | 'comint-highlight-prompt)) | ||
| 2091 | (setq comint-last-prompt | 2092 | (setq comint-last-prompt |
| 2092 | (cons (copy-marker prompt-start) (point-marker))) | 2093 | (cons (copy-marker prompt-start) (point-marker))) |
| 2093 | (with-silent-modifications | 2094 | (font-lock-prepend-text-property prompt-start (point) |
| 2094 | (font-lock-prepend-text-property prompt-start (point) | 2095 | 'font-lock-face |
| 2095 | 'font-lock-face | 2096 | 'comint-highlight-prompt) |
| 2096 | 'comint-highlight-prompt) | 2097 | (add-text-properties prompt-start (point) '(rear-nonsticky t))) |
| 2097 | (add-text-properties prompt-start (point) '(rear-nonsticky t)))) | ||
| 2098 | (goto-char saved-point))))))) | 2098 | (goto-char saved-point))))))) |
| 2099 | 2099 | ||
| 2100 | (defun comint-preinput-scroll-to-bottom () | 2100 | (defun comint-preinput-scroll-to-bottom () |