1 files changed, 25 insertions, 30 deletions

@@ -22,7 +22,7 @@
   `((global menu-item ,(string-trim-right
                           (format-mode-line mode-line-misc-info))
 
-            ignore)))
+            ignore :help (discord-date-string))))
 
 (defvar +tab-bar-show-original nil
   "Original value of `tab-bar-show'.")
@@ -129,35 +129,30 @@ Used by `tab-bar-format-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)))))))
+(el-patch-feature tab-bar)
+(with-eval-after-load 'tab-bar
+  (el-patch-defun tab-bar--format-tab (tab i)
+    "Format TAB using its index I and return the result as a keymap."
+    (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)
+          ,(alist-get 'binding tab)
+          :help "Click to visit tab"))))
+     (when (alist-get 'close-binding tab)
+       `((,(if (eq (car tab) 'current-tab) 'C-current-tab (intern (format "C-tab-%i" i)))
+          menu-item ""
+          ,(alist-get 'close-binding tab)))))))
 
 
 ;; Emacs 27