From 85834e973413b4ab050923d1dca4f0b4341d9b04 Mon Sep 17 00:00:00 2001 From: Manuel Giraud Date: Wed, 25 May 2022 15:13:17 +0200 Subject: [PATCH] sort `bookmark-alist' in last modified order by default. --- lisp/bookmark.el | 53 +++++++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 28 deletions(-) diff --git a/lisp/bookmark.el b/lisp/bookmark.el index c604395dd7..b56ad4fa67 100644 --- a/lisp/bookmark.el +++ b/lisp/bookmark.el @@ -251,8 +251,8 @@ bookmark-alist (BOOKMARK-NAME . PARAM-ALIST) or the deprecated form (BOOKMARK-NAME PARAM-ALIST). The alist is -ordered from most recently created bookmark at the front to least -recently created bookmark at the end. +ordered from most recently modified bookmark at the front to +least recently modified bookmark at the end. BOOKMARK-NAME is the name you gave to the bookmark when creating it. @@ -574,22 +574,18 @@ bookmark-store (bookmark-maybe-load-default-file) (let ((stripped-name (copy-sequence name))) (set-text-properties 0 (length stripped-name) nil stripped-name) - (if (and (not no-overwrite) - (bookmark-get-bookmark stripped-name 'noerror)) - ;; Already existing bookmark under that name and - ;; no prefix arg means just overwrite old bookmark. - (let ((bm (bookmark-get-bookmark stripped-name))) - ;; First clean up if previously location was fontified. - (when bookmark-set-fringe-mark - (bookmark--remove-fringe-mark bm)) - ;; Modify using the new (NAME . ALIST) format. - (setcdr bm alist)) - - ;; Otherwise just put it onto the front of the list. Either the - ;; bookmark doesn't exist already, or there is no prefix arg. - ;; In either case, we want the new bookmark on the front of the - ;; list, since the list is kept in reverse order of creation. - (push (cons stripped-name alist) bookmark-alist)) + + ;; Already existing bookmark under that name and no prefix arg + ;; means just overwrite old bookmark. First remove it. + (let ((bm (bookmark-get-bookmark stripped-name 'noerror))) + (when (and (not no-overwrite) bm) + ;; First clean up if previously location was fontified. + (when bookmark-set-fringe-mark + (bookmark--remove-fringe-mark bm)) + (setq bookmark-alist (delq bm bookmark-alist)))) + + ;; Put the new (or overwritten) bookmark onto the front of the list. + (push (cons stripped-name alist) bookmark-alist) ;; Added by db (setq bookmark-current-bookmark stripped-name) @@ -1144,7 +1140,7 @@ bookmark-maybe-sort-alist "Return `bookmark-alist' for display. If `bookmark-sort-flag' is non-nil, then return a sorted copy of the alist. Otherwise, just return `bookmark-alist', which by default is ordered -from most recently created to least recently created bookmark." +from most recently modified to least recently modified bookmark." (if bookmark-sort-flag (sort (copy-alist bookmark-alist) (lambda (x y) (string-lessp (car x) (car y)))) @@ -1831,19 +1827,19 @@ bookmark-bmenu--revert (setq tabulated-list-entries entries)) (setq tabulated-list-sort-key nil) ;; And since we're not sorting by bookmark name, show bookmarks - ;; according to order of creation, with the most recently + ;; according to order of modification, with the most recently ;; created bookmarks at the top and the least recently created ;; at the bottom. ;; ;; Note that clicking the column sort toggle for the bookmark ;; name column will invoke the `tabulated-list-mode' sort, which ;; uses `bookmark-bmenu--name-predicate' to sort lexically by - ;; bookmark name instead of by (reverse) creation order. + ;; bookmark name instead of by (reverse) modification order. ;; Clicking the toggle again will reverse the lexical sort, but - ;; the sort will still be lexical not creation-order. However, - ;; if the user reverts the buffer, then the above check of - ;; `bookmark-sort-flag' will happen again and the buffer will - ;; go back to a creation-order sort. This is all expected + ;; the sort will still be lexical not modification-order. + ;; However, if the user reverts the buffer, then the above check + ;; of `bookmark-sort-flag' will happen again and the buffer will + ;; go back to a modification-order sort. This is all expected ;; behavior, as documented in `bookmark-bmenu-mode'. (setq tabulated-list-entries (reverse entries))) ;; Generate the header only after `tabulated-list-sort-key' is @@ -1901,10 +1897,11 @@ bookmark-bmenu-mode toggle for the bookmark name column. If `bookmark-sort-flag' is nil, then sort the list by bookmark -creation order, with most recently created bookmarks on top. +modification order, with most recently modified bookmarks on top. However, the column sort toggle will still activate (and -thereafter toggle the direction of) lexical sorting by bookmark name. -At any time you may use \\[revert-buffer] to go back to sorting by creation order. +thereafter toggle the direction of) lexical sorting by bookmark +name. At any time you may use \\[revert-buffer] to go back to +sorting by modification order. \\ \\[bookmark-bmenu-mark] -- mark bookmark to be displayed. -- 2.36.0