From 4841a2d8aae1b7b2aa4bda6cf16c1be11d5b132a Mon Sep 17 00:00:00 2001 From: Wolfgang Jenkner Date: Fri, 17 Apr 2015 19:54:35 +0200 Subject: [PATCH] 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. --- lisp/comint.el | 22 +++++++++++----------- 1 file 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." (add-text-properties prompt-start (point) '(read-only t front-sticky (read-only))))) (when comint-last-prompt - (with-silent-modifications - (font-lock--remove-face-from-text-property - (car comint-last-prompt) - (cdr comint-last-prompt) - 'font-lock-face - 'comint-highlight-prompt))) + ;; There might be some keywords here waiting for + ;; fontification, so no `with-silent-modifications'. + (font-lock--remove-face-from-text-property + (car comint-last-prompt) + (cdr comint-last-prompt) + 'font-lock-face + 'comint-highlight-prompt)) (setq comint-last-prompt (cons (copy-marker prompt-start) (point-marker))) - (with-silent-modifications - (font-lock-prepend-text-property prompt-start (point) - 'font-lock-face - 'comint-highlight-prompt) - (add-text-properties prompt-start (point) '(rear-nonsticky t)))) + (font-lock-prepend-text-property prompt-start (point) + 'font-lock-face + 'comint-highlight-prompt) + (add-text-properties prompt-start (point) '(rear-nonsticky t))) (goto-char saved-point))))))) (defun comint-preinput-scroll-to-bottom () -- 2.39.5