From 1e3076e2dbddaeb8cf678a9bfb30b7d269de1479 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 30 Dec 2021 17:20:45 +1100 Subject: [PATCH 1/2] Fix bug where bookmark-jump used (point), not (point-at-bol) This matches changes from e852822f3db469c985bf022651f184d6ff2c518a, regression in 7fe88446c30279285e3171091189b3d1af697c05. * lisp/bookmark.el (bookmark--jump-via): Look at overlays at BOL. Otherwise the fringe bookmark indication is not deleted with the bookmark. Copyright-paperwork-exempt: yes --- lisp/bookmark.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/bookmark.el b/lisp/bookmark.el index 623f0acd28a..c5e7f2720d1 100644 --- a/lisp/bookmark.el +++ b/lisp/bookmark.el @@ -1164,7 +1164,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)) From f2031d0ddb6a21eebbf396094a5c4d4e73019271 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Thu, 30 Dec 2021 20:07:29 +0200 Subject: [PATCH 2/2] Minor improvement in user documentation of completion style * doc/emacs/mini.texi (Completion Styles): Add reference to "Completion Variables" in the ELisp manual. (Bug#52901) --- doc/emacs/mini.texi | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/doc/emacs/mini.texi b/doc/emacs/mini.texi index b0f6e424a7f..56222bb6e1c 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