diff options
| author | Wolfgang Jenkner <wjenkner@inode.at> | 2015-03-27 02:54:39 +0100 |
|---|---|---|
| committer | Wolfgang Jenkner <wjenkner@inode.at> | 2015-03-27 03:47:08 +0100 |
| commit | 792d44b3c31d2a682607ab8b79ae7d26b7402f41 (patch) | |
| tree | dacaaf290f706944a8585d7932cf23cacbca24fc /lisp/comint.el | |
| parent | 1d02107dab6f844a7c537bb5e98aff4e5f061246 (diff) | |
| download | emacs-792d44b3c31d2a682607ab8b79ae7d26b7402f41.tar.gz | |
Preserve face text properties in comint prompt.
Fixes: debbugs:20084
* lisp/font-lock.el (font-lock--remove-face-from-text-property): New
function. Adapted from the previously commented out
remove-single-text-property.
Remove previously unused and commented out auxiliary function
remove-text-property and obsolete comment.
* lisp/comint.el (comint-output-filter): Use it to remove
comint-highlight-prompt.
(comint-snapshot-last-prompt, comint-output-filter): Use
font-lock-prepend-text-property for comint-highlight-prompt.
* test/automated/textprop-tests.el: New file.
(textprop-tests-font-lock--remove-face-from-text-property): New test.
Thus, the original face text property of a prompt "candidate" (the
last line of an output chunk not ending with a newline) is
preserved. This amends the fix for bug#14744.
Diffstat (limited to 'lisp/comint.el')
| -rw-r--r-- | lisp/comint.el | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/lisp/comint.el b/lisp/comint.el index b6944da355c..31649ff31ca 100644 --- a/lisp/comint.el +++ b/lisp/comint.el @@ -1930,10 +1930,10 @@ the start, the cdr to the end of the last prompt recognized.") Freezes the `font-lock-face' text property in place." (when comint-last-prompt (with-silent-modifications - (add-text-properties + (font-lock-prepend-text-property (car comint-last-prompt) (cdr comint-last-prompt) - '(font-lock-face comint-highlight-prompt))) + 'font-lock-face 'comint-highlight-prompt)) ;; Reset comint-last-prompt so later on comint-output-filter does ;; not remove the font-lock-face text property of the previous ;; (this) prompt. @@ -2084,14 +2084,19 @@ Make backspaces delete the previous character." (add-text-properties prompt-start (point) '(read-only t front-sticky (read-only))))) (when comint-last-prompt - (remove-text-properties (car comint-last-prompt) - (cdr comint-last-prompt) - '(font-lock-face))) + (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))) - (add-text-properties prompt-start (point) - '(rear-nonsticky t - font-lock-face comint-highlight-prompt))) + (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)))) (goto-char saved-point))))))) (defun comint-preinput-scroll-to-bottom () |