From: Eshel Yaron <me@eshelyaron.com>
Date: Mon, 17 Jun 2024 10:51:19 +0000 (+0200)
Subject: Fix Bug#71603
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=206dcf004afba0afaa855b2e3de9817ccad6d635;p=emacs.git

Fix Bug#71603
---

diff --git a/lisp/bookmark.el b/lisp/bookmark.el
index 6056493c966..062ef1146be 100644
--- a/lisp/bookmark.el
+++ b/lisp/bookmark.el
@@ -1322,10 +1322,12 @@ 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)
-  (save-current-buffer
-    (funcall display-function (current-buffer)))
-  (let ((win (get-buffer-window (current-buffer) 0)))
-    (if win (set-window-point win (point))))
+  ;; Store `point', because `display-function' might change it.
+  (let ((bkmk-point (point)))
+    (save-current-buffer
+      (funcall display-function (current-buffer)))
+    (let ((win (get-buffer-window (current-buffer) 0)))
+      (if win (set-window-point win bkmk-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
@@ -2374,14 +2376,12 @@ the related behaviors of `bookmark-save' and `bookmark-bmenu-save'."
   (interactive nil bookmark-bmenu-mode)
   (bookmark-jump (bookmark-bmenu-bookmark)))
 
-
 (defun bookmark-bmenu-other-window ()
   "Select this line's bookmark in other window, leaving bookmark menu visible."
   (interactive nil bookmark-bmenu-mode)
   (let ((bookmark (bookmark-bmenu-bookmark)))
     (bookmark--jump-via bookmark 'switch-to-buffer-other-window)))
 
-
 (defun bookmark-bmenu-other-frame ()
   "Select this line's bookmark in other frame."
   (interactive nil bookmark-bmenu-mode)