branch: externals/auctex
commit 342fa714ae53c6e4ffd248310bb201bb97e2a9c0
Author: Arash Esbati <ar...@gnu.org>
Commit: Arash Esbati <ar...@gnu.org>
Add check for empty overlay
* tex-fold.el (TeX-fold-hide-item): Add an extra check to make
sure that the function runs when overlay start and end are
non-nil. What is done in the end of function isn't useful with
evaporated overlays and used to cause bugs because `overlay-start'
and `overlay-end' return nil for such overlays, and functions such
as `TeX-fold-overfull-p` try to move point to the
overlay-end. (bug#37337)
---
tex-fold.el | 38 ++++++++++++++++++++------------------
1 file changed, 20 insertions(+), 18 deletions(-)
diff --git a/tex-fold.el b/tex-fold.el
index f66776d..b14ec73 100644
--- a/tex-fold.el
+++ b/tex-fold.el
@@ -797,7 +797,7 @@ That means, put respective properties onto overlay OV."
(TeX-fold-expand-spec spec ov-start ov-end))
((functionp spec)
(let (arg arg-list
- (n 1))
+ (n 1))
(while (setq arg (TeX-fold-macro-nth-arg
n ov-start ov-end))
(unless (member (car arg) arg-list)
@@ -811,23 +811,25 @@ That means, put respective properties onto overlay OV."
"[Error: No content found]"))))
(display-string (if (listp computed) (car computed) computed))
(face (when (listp computed) (cadr computed))))
- ;; Cater for zero-length display strings.
- (when (string= display-string "") (setq display-string TeX-fold-ellipsis))
- ;; Add a linebreak to the display string and adjust the overlay end
- ;; in case of an overfull line.
- (when (TeX-fold-overfull-p ov-start ov-end display-string)
- (setq display-string (concat display-string "\n"))
- (move-overlay ov ov-start (save-excursion
- (goto-char ov-end)
- (skip-chars-forward " \t")
- (point))))
- (overlay-put ov 'mouse-face 'highlight)
- (overlay-put ov 'display display-string)
- (when font-lock-mode
- (overlay-put ov 'face TeX-fold-folded-face))
- (unless (zerop TeX-fold-help-echo-max-length)
- (overlay-put ov 'help-echo (TeX-fold-make-help-echo
- (overlay-start ov) (overlay-end ov))))))
+ ;; Do nothing if the overlay is empty.
+ (when (and ov-start ov-end)
+ ;; Cater for zero-length display strings.
+ (when (string= display-string "") (setq display-string
TeX-fold-ellipsis))
+ ;; Add a linebreak to the display string and adjust the overlay end
+ ;; in case of an overfull line.
+ (when (TeX-fold-overfull-p ov-start ov-end display-string)
+ (setq display-string (concat display-string "\n"))
+ (move-overlay ov ov-start (save-excursion
+ (goto-char ov-end)
+ (skip-chars-forward " \t")
+ (point))))
+ (overlay-put ov 'mouse-face 'highlight)
+ (overlay-put ov 'display display-string)
+ (when font-lock-mode
+ (overlay-put ov 'face TeX-fold-folded-face))
+ (unless (zerop TeX-fold-help-echo-max-length)
+ (overlay-put ov 'help-echo (TeX-fold-make-help-echo
+ (overlay-start ov) (overlay-end ov)))))))
(defun TeX-fold-show-item (ov)
"Show a single LaTeX macro or environment.
