gitback/doomemacs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wg-workgroup-list macro causes byte-compiler problems; replace with impl

Browse Source
This commit is contained in:
Henrik Lissner 2016-06-06 19:44:26 -04:00
parent af0a776fa5
commit ed8f744261
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/defuns/defuns-workgroup.el
View File

@ -52,7 +52,7 @@
"Create a new workgroup. If BANG, overwrite any workgroup named NAME." "Create a new workgroup. If BANG, overwrite any workgroup named NAME."
(interactive "<!><a>") (interactive "<!><a>")
(unless name (unless name
(setq name (format "#%s" (1+ (length (wg-workgroup-list)))))) (setq name (format "#%s" (1+ (length (wg-session-workgroup-list (wg-current-session t)))))))
(let ((new-wg (wg-get-workgroup name t))) (let ((new-wg (wg-get-workgroup name t)))
(when (and new-wg bang) (when (and new-wg bang)
(wg-delete-workgroup new-wg) (wg-delete-workgroup new-wg)
@ -98,7 +98,7 @@
"Kill all other workgroups." "Kill all other workgroups."
(interactive) (interactive)
(let (workgroup (wg-current-workgroup)) (let (workgroup (wg-current-workgroup))
(dolist (w (wg-workgroup-list)) (dolist (w (wg-session-workgroup-list (wg-current-session t)))
(unless (wg-current-workgroup-p w) (unless (wg-current-workgroup-p w)
(wg-kill-workgroup w))))) (wg-kill-workgroup w)))))
@ -123,7 +123,7 @@
;;;###autoload ;;;###autoload
(defun doom/workgroup-display (&optional suppress-update return-p message) (defun doom/workgroup-display (&optional suppress-update return-p message)
(interactive) (interactive)
(when (wg-current-session t) (awhen (wg-current-session t)
(unless (eq suppress-update t) (unless (eq suppress-update t)
(doom/workgroup-update-names (if (wg-workgroup-p suppress-update) suppress-update))) (doom/workgroup-update-names (if (wg-workgroup-p suppress-update) suppress-update)))
(let ((output (wg-display-internal (let ((output (wg-display-internal
@ -133,7 +133,7 @@
workgroup workgroup
(format " %s %s " (doom--num-to-unicode (1+ index)) (wg-workgroup-name workgroup)) (format " %s %s " (doom--num-to-unicode (1+ index)) (wg-workgroup-name workgroup))
'wg-current-workgroup-p))) 'wg-current-workgroup-p)))
(wg-workgroup-list)))) (wg-session-workgroup-list it))))
(if return-p (if return-p
output output
(message "%s%s" output (or message "")))))) (message "%s%s" output (or message ""))))))