procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Handle correctly DISPLAY-FUNCTION arg in 'bookmark--jump-via'

Browse source 
This fixes bug #75354 where when jumping to a eww bmk to other
window (or frame) the buffer is displayed both in other window
and current window.
Previously 'bookmark--jump-via' was calling DISPLAY-FUNCTION on the
current-buffer from the new buffer created by bookmark handler
(e.g. eww) now DISPLAY-FUNCTION is called on the new buffer from
the current buffer (winconf is saved when calling handler).
In addition to make eww bookmarks displayed properly, this fix as
well w3m bookmarks and as a side effect fix the eww quit function
which restore properly winconf after quitting (previously leaving
two windows open).
* lisp/bookmark.el (bookmark--jump-via): Fix it.
This commit is contained in:
Thierry Volpiatto 2025-01-08 10:45:55 +01:00 • committed by Eli Zaretskii
parent edec6e2264
commit 78f5ea750a
1 changed files with 22 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
lisp/bookmark.el
View file

@ -1256,33 +1256,34 @@ Useful for example to unhide text in `outline-mode'.")
(defun bookmark--jump-via (bookmark-name-or-record display-function)
"Handle BOOKMARK-NAME-OR-RECORD, then call DISPLAY-FUNCTION.
DISPLAY-FUNCTION is called with the current buffer as argument.
DISPLAY-FUNCTION is called with the new buffer as argument.
After calling DISPLAY-FUNCTION, set window point to the point specified
by BOOKMARK-NAME-OR-RECORD, if necessary, run `bookmark-after-jump-hook',
and then show any annotations for this bookmark."
(bookmark-handle-bookmark bookmark-name-or-record)
;; Store `point' now, because `display-function' might change it.
(let ((point (point)))
(save-current-buffer
(funcall display-function (current-buffer)))
(let ((win (get-buffer-window (current-buffer) 0)))
(if win (set-window-point win point))))
;; FIXME: we used to only run bookmark-after-jump-hook in
;; `bookmark-jump' itself, but in none of the other commands.
(when bookmark-fringe-mark
(let ((overlays (overlays-in (pos-bol) (1+ (pos-bol))))
temp found)
(while (and (not found) (setq temp (pop overlays)))
(when (eq 'bookmark (overlay-get temp 'category))
(setq found t)))
(unless found
(bookmark--set-fringe-mark))))
(run-hooks 'bookmark-after-jump-hook)
(if bookmark-automatically-show-annotations
(let (buf point)
(save-window-excursion
(bookmark-handle-bookmark bookmark-name-or-record)
(setq buf (current-buffer)
point (point)))
(funcall display-function buf)
(when-let* ((win (get-buffer-window buf 0)))
(set-window-point win point))
(when bookmark-fringe-mark
(let ((overlays (overlays-in (pos-bol) (1+ (pos-bol))))
temp found)
(while (and (not found) (setq temp (pop overlays)))
(when (eq 'bookmark (overlay-get temp 'category))
(setq found t)))
(unless found
(bookmark--set-fringe-mark))))
;; FIXME: we used to only run bookmark-after-jump-hook in
;; `bookmark-jump' itself, but in none of the other commands.
(run-hooks 'bookmark-after-jump-hook)
(when bookmark-automatically-show-annotations
;; if there is an annotation for this bookmark,
;; show it in a buffer.
(bookmark-show-annotation bookmark-name-or-record)))
(bookmark-show-annotation bookmark-name-or-record))))
;;;###autoload