emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix(tabs): wrong-type-arg stringp (Git "...") error

Browse source 
Newer versions of project.el changed the return value of
`project-current` to a three-part list, rather than a cons cell.
centaur-tabs expects the old signature and we get a type error.

This advice ensures centaur-tabs works with old or new versions of
project, and is a temporary measure until the issue is resolved
upstream.

Ref: ema2159/centaur-tabs#181
Fix: #6280
This commit is contained in:
Henrik Lissner 2022-06-20 02:05:03 +02:00
parent fb1c8eb11d
commit 8b93e8b15c
No known key found for this signature in database
GPG key ID: B60957CA074D39A3
1 changed files with 14 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

15
modules/ui/tabs/config.el
View file

@ -19,7 +19,20 @@
(defun +tabs-disable-centaur-tabs-mode-maybe-h () (defun +tabs-disable-centaur-tabs-mode-maybe-h ()
"Disable `centaur-tabs-mode' in current buffer." "Disable `centaur-tabs-mode' in current buffer."
(when (centaur-tabs-mode-on-p) (when (centaur-tabs-mode-on-p)
(centaur-tabs-local-mode))))) (centaur-tabs-local-mode))))
(defadvice! +tabs--fixed-centaur-tabs-project-name-a ()
:override #'centaur-tabs-project-name
(let ((project-name (cdr (project-current))))
;; In earlier versions of project.el, `project-current' returned a cons
;; cell (VCBACKEND . PROJECTROOT). In more recent versions it returns
;; (TYPE VCBACKEND PROJECTROOT), which throws an error.
;; REVIEW This should be upstreamed.
(when (listp project-name)
(setq project-name (cadr project-name)))
(if project-name
(format "Project: %s" (expand-file-name project-name))
centaur-tabs-common-group-name))))
;; TODO tab-bar-mode (emacs 27) ;; TODO tab-bar-mode (emacs 27)