mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-30 04:10:54 -08:00
Code Issues Projects Releases Wiki Activity

comint.el (comint-output-filter): Fix rear-nonsticky property placement.

Browse source 
Fixes: debbugs:16010
This commit is contained in:
Vitalie Spinu 2013-12-20 14:25:19 +08:00 • committed by Chong Yidong
parent a9574eb730
commit ca65efcc2e
2 changed files with 15 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -1,3 +1,8 @@
2013-12-20 Vitalie Spinu <spinuvit@gmail.com>
* comint.el (comint-output-filter): Fix rear-nonsticky property
placement (Bug#16010).
2013-12-20 Chong Yidong <cyd@gnu.org>
* faces.el (read-color): Minor fix for completion function.

21
lisp/comint.el
View file

@ -2062,23 +2062,22 @@ Make backspaces delete the previous character."
(let ((prompt-start (save-excursion (forward-line 0) (point)))
(inhibit-read-only t))
(when comint-prompt-read-only
(with-silent-modifications
(or (= (point-min) prompt-start)
(get-text-property (1- prompt-start) 'read-only)
(put-text-property
(1- prompt-start) prompt-start 'read-only 'fence))
(add-text-properties
prompt-start (point)
'(read-only t rear-nonsticky t front-sticky (read-only)))))
(with-silent-modifications
(or (= (point-min) prompt-start)
(get-text-property (1- prompt-start) 'read-only)
(put-text-property (1- prompt-start)
prompt-start 'read-only 'fence))
(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)))
(setq comint-last-prompt
(cons (copy-marker prompt-start) (point-marker)))
(add-text-properties (car comint-last-prompt)
(cdr comint-last-prompt)
'(font-lock-face comint-highlight-prompt)))
(add-text-properties prompt-start (point)
'(rear-nonsticky t
font-lock-face comint-highlight-prompt)))
(goto-char saved-point)))))))
(defun comint-preinput-scroll-to-bottom ()