master 1d92f6094c 1/3: Merge from origin/emacs-28

[Stefan Kangas]

branch: master
commit 1d92f6094c96de83de8aa3c15a64cef656a63dcc
Merge: 57753ed761 f2031d0ddb
Author: Stefan Kangas <stefan@marxist.se>
Commit: Stefan Kangas <stefan@marxist.se>

    Merge from origin/emacs-28
    
    f2031d0ddb Minor improvement in user documentation of completion style
    1e3076e2db Fix bug where bookmark-jump used (point), not (point-at-bol)
---
 doc/emacs/mini.texi | 5 ++++-
 lisp/bookmark.el    | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/doc/emacs/mini.texi b/doc/emacs/mini.texi
index b0f6e424a7..56222bb6e1 100644
--- a/doc/emacs/mini.texi
+++ b/doc/emacs/mini.texi
@@ -497,7 +497,10 @@ falls back on the next style.
 @vindex completion-styles
   The list variable @code{completion-styles} specifies the completion
 styles to use.  Each list element is the name of a completion style (a
-Lisp symbol).  The default completion styles are (in order):
+Lisp symbol).  The available style symbols are stored in the variable
+@code{completion-styles-alist} (@pxref{Completion Variables,,, elisp,
+The Emacs Lisp Reference Manual}).  The default completion styles are
+(in order):
 
 @table @code
 @item basic
diff --git a/lisp/bookmark.el b/lisp/bookmark.el
index f35cbc1a5e..0c93cec809 100644
--- a/lisp/bookmark.el
+++ b/lisp/bookmark.el
@@ -1155,7 +1155,7 @@ and then show any annotations for this bookmark."
   ;; FIXME: we used to only run bookmark-after-jump-hook in
   ;; `bookmark-jump' itself, but in none of the other commands.
   (when bookmark-set-fringe-mark
-    (let ((overlays (overlays-in (point) (point)))
+    (let ((overlays (overlays-in (point-at-bol) (1+ (point-at-bol))))
           temp found)
       (while (and (not found) (setq temp (pop overlays)))
         (when (eq 'bookmark (overlay-get temp 'category))