martin/emacs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

(comint--fontify-input-fontify-region): Silence messages (bug#80870)

Browse Source 
`syntax-propertize` currently doesn't support propertizing only
parts of a buffer.  Maybe we should improve it, maybe via
something like `font-lock-dont-widen` or the `syntax-ppss` support for
narrowing, but in the mean time, teach comint to avoid holes in
the propertization.

* lisp/comint.el (comint--dummy-fontify-syntax): New function.
(comint--fontify-input-fontify-region): Use it to silence the
new "Cannot syntax-propertize" message in `syntax.el`.
Also, refine args to reflect the fact that it's an advice.
This commit is contained in:
Stefan Monnier
2026-04-23 11:16:05 -04:00
parent 65bd3fe047
commit e8535ba110
1 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
lisp/comint.el
View File

@@ -4157,14 +4157,21 @@ setting."
(when (memq #'syntax-ppss-flush-cache before-change-functions)
(apply #'syntax-ppss-flush-cache beg rest)))))
(defun comint--fontify-input-fontify-region (fun beg end verbose)
"Fontify process output and user input in the current comint buffer.
First, fontify the region between BEG and END using FUN. Then
fontify only the input text in the region with the help of an
indirect buffer. VERBOSE is passed to the fontify-region
functions. Skip fontification of input regions with non-nil
`comint--fontify-input-inhibit-fontification' text property."
(pcase (funcall fun beg end verbose)
(defun comint--dummy-fontify-syntax (end)
;; Tell `syntax-propertize' that there's nothing
;; to propertize here.
;; BEWARE: don't use `ignore' because `syntax-propertize'
;; treats it specially.
(let ((syntax-propertize-function (lambda (&rest _) nil)))
(syntax-propertize end)))
(defun comint--fontify-input-fontify-region (orig-fun beg end &rest args)
"Fontify user input in the current comint buffer.
Fontify the input text in the region with the help of an indirect buffer.
Skip fontification of input regions with non-nil
`comint--fontify-input-inhibit-fontification' text property.
Designed as an advice for use in `font-lock-fontify-region-function'."
(pcase (apply orig-fun beg end args)
(`(jit-lock-bounds ,beg1 . ,end1)
(setq beg beg1 end end1)))
(pcase
@@ -4173,10 +4180,12 @@ functions. Skip fontification of input regions with non-nil
(with-current-buffer (comint-indirect-buffer)
(narrow-to-region min max)
(comint--intersect-regions
nil (lambda (beg end)
(unless (get-text-property
beg 'comint--fontify-input-inhibit-fontification)
(font-lock-fontify-region beg end verbose)))
(lambda (_beg end) (comint--dummy-fontify-syntax end))
(lambda (beg end)
(if (get-text-property
beg 'comint--fontify-input-inhibit-fontification)
(comint--dummy-fontify-syntax end)
(apply #'font-lock-fontify-region beg end args)))
beg end)))
(`((jit-lock-bounds ,beg1 . ,_) . (jit-lock-bounds ,_ . ,end1))
(setq beg (min beg beg1))