tracking on scratch moved to jao-tracking

1 files changed, 5 insertions, 20 deletions

diff --git a/init.el b/init.el
index 92495d8..599492f 100644
--- a/init.el
+++ b/init.el
@@ -738,22 +738,6 @@
 ;;;; jao-notify
 (require 'jao-notify)
 ;;;; tracking
-(defvar jao-tracking-use-scratch (not window-system))
-(defvar jao-tracking--start-frame nil)
-
-(defun jao-tracking-next-buffer ()
-  (interactive)
-  (when jao-tracking-use-scratch
-    (let ((n (jao-afio-frame-no)))
-      (unless (eq 0 n) (setq jao-tracking--start-frame n))
-      (cond (tracking-buffers
-             (jao-afio--goto-scratch))
-            (jao-tracking--start-frame
-             (jao-afio-goto-nth jao-tracking--start-frame)
-             (setq jao-tracking--start-frame nil)))))
-  (tracking-next-buffer)
-  (jao-tracking-update-minibuffer))
-
 (use-package tracking
   :demand t
   :init (setq tracking-position 'before-modes
@@ -763,14 +747,15 @@
               tracking-sort-faces-first t
               tracking-shorten-modes '())
   :config
-  (setq erc-track-enable-keybindings nil)
-
-  :bind (("C-c C-SPC" . jao-tracking-next-buffer)))
+  (setq erc-track-enable-keybindings nil))
 
 (use-package jao-tracking
   :demand t
   :init (setq jao-tracking-bkg
-              (if (jao-colors-scheme-dark-p) "grey20" "grey93")))
+              (if (jao-colors-scheme-dark-p) "grey20" "grey93")
+              jao-tracking-use-scratch (not window-system))
+  :config (jao-tracking-set-up)
+  :bind (("C-c C-SPC" . jao-tracking-next-buffer)))
 
 ;;;; tmr
 (use-package tmr