From a7c9618efdd423134990c22d62513eac50ab98e3 Mon Sep 17 00:00:00 2001 From: Karl Fogel Date: Thu, 18 Apr 2024 23:49:29 -0500 Subject: [PATCH] Fix two bugs in removing bookmark fringe marks This fixes bug#70019 and a separate fringe-mark removal bug that affected bookmarks in Info "dir" nodes. * lisp/bookmark.el (bookmark--remove-fringe-mark): Fix bug#70019 by temporarily widening in order to ensure we fetch the right overlays. Also, don't tamper with the filename as received from the bookmark object, since we will compare the received filename against one generated dynamically by the same means (`bookmark-buffer-file-name') to determine whether or not we're in the right buffer. --- lisp/bookmark.el | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/lisp/bookmark.el b/lisp/bookmark.el index bf2357207d8..5d01fe24991 100644 --- a/lisp/bookmark.el +++ b/lisp/bookmark.el @@ -515,15 +515,30 @@ bookmark--remove-fringe-mark (non-essential t) overlays found temp) (when (and pos filename) - (setq filename (abbreviate-file-name (expand-file-name filename))) (dolist (buf (buffer-list)) (with-current-buffer buf (when (equal filename (ignore-errors (bookmark-buffer-file-name))) (setq overlays (save-excursion - (goto-char pos) - (overlays-in (pos-bol) (1+ (pos-bol))))) + (save-restriction + ;; Suppose bookmark "foo" was earlier set at + ;; location X in a file, but now the file is + ;; narrowed such that X is outside the restriction. + ;; Then the `goto-char' below would go to the + ;; wrong place and thus the wrong overlays would + ;; be fetched. This is why we temporarily `widen' + ;; before fetching. + ;; + ;; (This circumstance can easily arise when a + ;; bookmark was set on Info node X but now the + ;; "*info*" buffer is showing some other node Y, + ;; with X and Y physically located in the same + ;; file, as is often the case with Info nodes. + ;; See bug #70019, for example.) + (widen) + (goto-char pos) + (overlays-in (pos-bol) (1+ (pos-bol)))))) (while (and (not found) (setq temp (pop overlays))) (when (eq 'bookmark (overlay-get temp 'category)) (delete-overlay (setq found temp)))))))))) -- 2.43.0