Merge branch 'main' of https://tildegit.org/acdw/emacs

3 files changed, 81 insertions, 7 deletions

@@ -590,7 +590,17 @@
            tab-bar-tab-name-ellipsis truncate-string-ellipsis
            tab-bar-show t)
   (tab-bar-mode +1)
-  (+tab-bar-misc-info-mode +1))
+  (if (version< emacs-version "28.0")
+      (+tab-bar-misc-info-mode +1)
+    (:option tab-bar-format '(+tab-bar-format-menu-bar
+                              tab-bar-format-history
+                              tab-bar-format-tabs
+                              tab-bar-separator
+                              tab-bar-format-add-tab
+                              tab-bar-format-align-right
+                              +tab-bar-misc-info
+                              tab-bar-separator
+                              ))))
 
 (setup text
   (:hook #'turn-on-auto-fill))
@@ -40,7 +40,7 @@ segment to make that segment match accordingly."
          (derived-mode-p 'eshell-mode))
      ;; File extension
      (string-match-p "\\`\\.." pattern))
-    (cons orderless-regexp
+    (cons 'orderless-regexp
           (concat "\\." (substring pattern 1) "[\x100000-\x10FFFD]*$")))
    ;; Ignore single !
    ((string= "!" pattern) `(orderless-literal . ""))
@@ -9,13 +9,19 @@
 
 (require 'tab-bar)
 
+(defface +tab-bar-extra
+  '((t :inherit (tab-bar font-lock-comment-face)))
+  "Tab bar face for extra information, like the menu-bar and time."
+  :group 'basic-faces)
+
 
 ;; Common
 
 (defun +tab-bar-misc-info ()
   "Display `mode-line-misc-info', formatted for the tab-bar."
   `((global menu-item ,(string-trim-right
-                        (format-mode-line mode-line-misc-info))
+                          (format-mode-line mode-line-misc-info))
+
             ignore)))
 
 (defvar +tab-bar-show-original nil
@@ -24,10 +30,12 @@
 (defun +tab-bar-basename ()
   "Generate the tab name from the basename of the buffer of the
   selected window."
-  (let* ((tab-file-name (buffer-file-name (window-buffer (minibuffer-selected-window)))))
-    (if tab-file-name
-        (file-name-nondirectory tab-file-name)
-      (+tab-bar-tab-name-truncated-left))))
+  (let* ((tab-file-name (buffer-file-name (window-buffer
+                                           (minibuffer-selected-window)))))
+    (concat " "
+            (if tab-file-name
+                (file-name-nondirectory tab-file-name)
+              (+tab-bar-tab-name-truncated-left)))))
 
 (defun +tab-bar-tab-name-truncated-left ()
   "Generate the tab name from the buffer of the selected window.
@@ -50,6 +58,62 @@ name to the left."
                   'help-echo tab-name))))
 
 
+;;; Menu bar
+;; stole from https://github.com/emacs-mirror/emacs/blob/master/lisp/tab-bar.el
+
+(defun +tab-bar-menu-bar (event)
+  "Pop up the same menu as displayed by the menu bar.
+Used by `tab-bar-format-menu-bar'."
+  (interactive "e")
+  (let ((menu (make-sparse-keymap (propertize "Menu Bar" 'hide t))))
+    (run-hooks 'activate-menubar-hook 'menu-bar-update-hook)
+    (map-keymap (lambda (key binding)
+                  (when (consp binding)
+                    (define-key-after menu (vector key)
+                      (copy-sequence binding))))
+                (menu-bar-keymap))
+    (popup-menu menu event)))
+
+(defun +tab-bar-format-menu-bar ()
+  "Produce the Menu button for the tab bar that shows the menu bar."
+  `((menu-bar menu-item (propertize " Ɛ " 'face '+tab-bar-extra)
+              +tab-bar-menu-bar :help "Menu Bar")))
+
+
+;;; Tab bar format tabs
+
+(require 'el-patch)
+
+(el-patch-defun tab-bar--format-tab (tab i)
+  (append
+   (el-patch-remove
+     `((,(intern (format "sep-%i" i)) menu-item ,(tab-bar-separator) ignore)))
+   (cond
+    ((eq (car tab) 'current-tab)
+     `((current-tab
+        menu-item
+        ,(funcall tab-bar-tab-name-format-function tab i)
+        ignore
+        :help "Current tab")))
+    (t
+     `((,(intern (format "tab-%i" i))
+        menu-item
+        ,(funcall tab-bar-tab-name-format-function tab i)
+        ,(or
+          (alist-get 'binding tab)
+          `(lambda ()
+             (interactive)
+             (tab-bar-select-tab ,i)))
+        :help "Click to visit tab"))))
+   `((,(if (eq (car tab) 'current-tab) 'C-current-tab (intern (format "C-tab-%i" i)))
+      menu-item ""
+      ,(or
+        (alist-get 'close-binding tab)
+        `(lambda ()
+           (interactive)
+           (tab-bar-close-tab ,i)))))))
+
+
 ;; Emacs 27
 
 (defun +tab-bar-misc-info-27 (output &rest _)