1 files changed, 4 insertions, 9 deletions

@@ -7,6 +7,7 @@
 
 ;;; Code:
 
+(require 'acdw)
 (require 'tab-bar)
 
 (defface +tab-bar-extra
@@ -35,7 +36,7 @@
   "Display `tracking-mode-line-buffers' in the tab-bar."
   ;; TODO: write something to convert a mode-line construct to a tab-bar
   ;; construct.
-  (when (and tracking-mode
+  (when (and (bound-and-true-p tracking-mode)
              (not (and +tracking-hide-when-org-clocking
                        (bound-and-true-p org-clock-current-task))))
     (cons (when (> (length tracking-mode-line-buffers) 0)
@@ -261,14 +262,8 @@ name to the left."
   (require 'shr)                        ; `shr-string-pixel-width'
   (let* ((rest (cdr (memq '+tab-bar-format-align-right tab-bar-format)))
          (rest (tab-bar-format-list rest))
-         (rest (mapconcat (lambda (item) x(nth 2 item)) rest ""))
-         (hpos
-          ;; I have to rewrite `shr-string-pixel-width' to take the tab-bar face
-          ;; into account.
-          (let ((pt (point)))
-            (prog1 (with-temp-buffer (insert (propertize rest 'face 'tab-bar))
-                                     (shr-pixel-column))
-              (goto-char pt))))
+         (rest (mapconcat (lambda (item) (nth 2 item)) rest ""))
+         (hpos (shr-string-pixel-width rest))
          (str (propertize " " 'display `(space :align-to (- right (,hpos))))))
     `((align-right menu-item ,str ignore))))