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

ui/tabs: fix vestigial function references

Browse source 
And rename window paramater to tab-buffers
This commit is contained in:
Henrik Lissner 2019-08-15 15:53:47 -04:00
parent ad4e93745a
commit 85b36c4aec
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
2 changed files with 14 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

25
modules/ui/tabs/autoload.el
View file

@ -3,7 +3,7 @@
;;;###autoload ;;;###autoload
(defun +tabs-buffer-predicate (buffer) (defun +tabs-buffer-predicate (buffer)
"TODO" "TODO"
(or (memq buffer (window-parameter nil 'tabbar-buffers)) (or (memq buffer (window-parameter nil 'tab-buffers))
(eq buffer (doom-fallback-buffer)))) (eq buffer (doom-fallback-buffer))))
;;;###autoload ;;;###autoload
@ -12,7 +12,7 @@
;;;###autoload ;;;###autoload
(defun +tabs-window-buffer-list-fn () (defun +tabs-window-buffer-list-fn ()
(cl-delete-if-not #'buffer-live-p (window-parameter nil 'tabbar-buffers))) (cl-delete-if-not #'buffer-live-p (window-parameter nil 'tab-buffers)))
;;;###autoload ;;;###autoload
(defun +tabs-buffer-groups-fn () (defun +tabs-buffer-groups-fn ()
@ -38,11 +38,11 @@
;;; Commands ;;; Commands
;;;###autoload ;;;###autoload
(defun +tabbar/close-tab-or-window () (defun +tabs/close-tab-or-window ()
"TODO" "TODO"
(interactive) (interactive)
(call-interactively (call-interactively
(cond ((cdr (window-parameter nil 'tabbar-buffers)) (cond ((cdr (window-parameter nil 'tab-buffers))
#'kill-current-buffer) #'kill-current-buffer)
((fboundp '+workspace/close-window-or-workspace) ((fboundp '+workspace/close-window-or-workspace)
#'+workspace/close-window-or-workspace) #'+workspace/close-window-or-workspace)
@ -54,7 +54,7 @@
;;;###autoload ;;;###autoload
(defun +tabs-kill-current-buffer-a (&rest _) (defun +tabs-kill-current-buffer-a (&rest _)
(+tabbar|remove-buffer)) (+tabs|remove-buffer))
;;;###autoload ;;;###autoload
(defun +tabs-bury-buffer-a (orig-fn &rest args) (defun +tabs-bury-buffer-a (orig-fn &rest args)
@ -63,7 +63,7 @@
(apply orig-fn args) (apply orig-fn args)
(unless (eq b (current-buffer)) (unless (eq b (current-buffer))
(with-current-buffer b (with-current-buffer b
(+tabbar|remove-buffer)))) (+tabs|remove-buffer))))
(apply orig-fn args))) (apply orig-fn args)))
;;;###autoload ;;;###autoload
@ -84,20 +84,21 @@
(when (and centaur-tabs-mode (when (and centaur-tabs-mode
(doom-real-buffer-p (current-buffer))) (doom-real-buffer-p (current-buffer)))
(let* ((this-buf (current-buffer)) (let* ((this-buf (current-buffer))
(buffers (window-parameter nil 'tabbar-buffers))) (buffers (window-parameter nil 'tab-buffers)))
(cl-pushnew this-buf buffers) (cl-pushnew this-buf buffers)
(add-hook 'kill-buffer-hook #'+tabbar|remove-buffer nil t) (add-hook 'kill-buffer-hook #'+tabs|remove-buffer nil t)
(set-window-parameter nil 'tabbar-buffers buffers)))) (set-window-parameter nil 'tab-buffers buffers))))
;;;###autoload ;;;###autoload
(defun +tabbar|remove-buffer () (defun +tabs|remove-buffer ()
(when centaur-tabs-mode (when centaur-tabs-mode
(set-window-parameter (set-window-parameter
nil nil
'tabbar-buffers (delete (current-buffer) (window-parameter nil 'tabbar-buffers))))) 'tab-buffers (delete (current-buffer)
(window-parameter nil 'tab-buffers)))))
;;;###autoload ;;;###autoload
(defun +tabs-new-window-h () (defun +tabs-new-window-h ()
(when centaur-tabs-mode (when centaur-tabs-mode
(unless (window-parameter nil 'tabbar-buffers) (unless (window-parameter nil 'tab-buffers)
(+tabs-add-buffer-h)))) (+tabs-add-buffer-h))))

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

@ -16,7 +16,7 @@
(set-frame-parameter frame 'old-buffer-predicate (frame-parameter frame 'buffer-predicate)) (set-frame-parameter frame 'old-buffer-predicate (frame-parameter frame 'buffer-predicate))
(set-frame-parameter frame 'buffer-predicate #'+tabs-buffer-predicate))))) (set-frame-parameter frame 'buffer-predicate #'+tabs-buffer-predicate)))))
(add-to-list 'window-persistent-parameters '(tabbar-buffers . writable)) (add-to-list 'window-persistent-parameters '(tab-buffers . writable))
(setq centaur-tabs-buffer-list-function #'+tabs-window-buffer-list-fn (setq centaur-tabs-buffer-list-function #'+tabs-window-buffer-list-fn
centaur-tabs-buffer-groups-function #'+tabs-buffer-groups-fn) centaur-tabs-buffer-groups-function #'+tabs-buffer-groups-fn)