* lisp/buff-menu.el: Support a function value of Buffer-menu-group-by.

(Buffer-menu-group-by): Add a choice for a function that
returns names of all levels.
(list-buffers--refresh): If Buffer-menu-group-by is a function,
then use it directly.

(cherry picked from commit 0aed6f5f0d9319dc616424e2c7df80580a04c739)

diff --git a/lisp/buff-menu.el b/lisp/buff-menu.el
index fa706a4e1a725cc2f163c9040a14765b3b0cb099..9bd15dde59d3b3ddcf14d8010f03c8b90fd90a6c 100644 (file)
--- a/lisp/buff-menu.el
+++ b/lisp/buff-menu.el
@@ -97,6 +97,8 @@ as it is by default."
 
 (defcustom Buffer-menu-group-by nil
   "If non-nil, functions to call to divide buffer-menu buffers into groups.
+When customized to a function, this function should return names
+of all levels for each entry.
 When customized to a list of functions, then each function defines
 the group name at each nested level of multiple levels.
 Each function is called with one argument: a list of entries in the same
@@ -109,13 +111,14 @@ The default options can group by a mode, and by a root directory of
 a project or just `default-directory'.
 If this is nil, buffers are not divided into groups."
   :type '(choice (const :tag "No grouping" nil)
-                 (repeat :tag "Group by"
+                 (function :tag "Custom function")
+                 (repeat :tag "Use levels"
                   (choice
                    (const :tag "Group by project root or directory"
                           Buffer-menu-group-by-root)
                    (const :tag "Group by mode"
                           Buffer-menu-group-by-mode)
-                   (function :tag "Custom function"))))
+                   (function :tag "Custom level function"))))
   :group 'Buffer-menu
   :version "30.1")
 
@@ -854,9 +857,11 @@ See more at `Buffer-menu-filter-predicate'."
           (tabulated-list-groups
            tabulated-list-entries
            `(:path-function
-             ,(lambda (entry)
-                (list (mapcar (lambda (f) (funcall f entry))
-                              Buffer-menu-group-by)))
+             ,(if (functionp Buffer-menu-group-by)
+                  Buffer-menu-group-by
+                (lambda (entry)
+                  (list (mapcar (lambda (f) (funcall f entry))
+                                Buffer-menu-group-by))))
              :sort-function ,Buffer-menu-group-sort-by))))
   (tabulated-list-init-header))