master 42366383c6: Update bookmark sort indicator at proper time

[Karl Fogel]

branch: master
commit 42366383c6327e731e286266665d1bb3d6ab1526
Author: Karl Fogel <kfogel@red-bean.com>
Commit: Karl Fogel <kfogel@red-bean.com>

    Update bookmark sort indicator at proper time
    
    This follows up to my commit 8b071c77b0d7 of 2022-04-24.  Thanks to
    Manuel Giraud <manuel@ledu-giraud.fr> for reporting the buglet.
---
 lisp/bookmark.el | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/lisp/bookmark.el b/lisp/bookmark.el
index 6c46268a34..c604395dd7 100644
--- a/lisp/bookmark.el
+++ b/lisp/bookmark.el
@@ -1823,7 +1823,6 @@ Don't affect the buffer ring order."
                  ,@(if bookmark-bmenu-toggle-filenames
                        (list location))])
               entries)))
-    (tabulated-list-init-header)
     ;; The value of `bookmark-sort-flag' might have changed since the
     ;; last time the buffer contents were generated, so re-check it.
     (if bookmark-sort-flag
@@ -1846,7 +1845,12 @@ Don't affect the buffer ring order."
       ;; `bookmark-sort-flag' will happen again and the buffer will
       ;; go back to a creation-order sort.  This is all expected
       ;; behavior, as documented in `bookmark-bmenu-mode'.
-      (setq tabulated-list-entries (reverse entries))))
+      (setq tabulated-list-entries (reverse entries)))
+    ;; Generate the header only after `tabulated-list-sort-key' is
+    ;; settled, because if that's non-nil then the sort-direction
+    ;; indicator will be shown in the named column, but if it's
+    ;; nil then the indicator will not be shown.
+    (tabulated-list-init-header))
   (tabulated-list-print t))
 
 ;;;###autoload