From baba0294bb8ed855cd29c5f7b7ff7a3627bb7e56 Mon Sep 17 00:00:00 2001
From: Benson Chu <bensonchu457@gmail.com>
Date: Mon, 18 Jan 2021 19:20:19 -0600
Subject: [PATCH] Disable this temporarily, not working atm.

---
 .../org-config/org-capture-emacs-exit-warn.el | 24 ++++++++++---------
 lisp/switch-tabs.el                           | 17 ++++++++++---
 2 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/lisp/org-config/org-capture-emacs-exit-warn.el b/lisp/org-config/org-capture-emacs-exit-warn.el
index 0a0a44d..34f2e83 100644
--- a/lisp/org-config/org-capture-emacs-exit-warn.el
+++ b/lisp/org-config/org-capture-emacs-exit-warn.el
@@ -27,17 +27,19 @@
 (defvar capture-count 0)
 
 (defun warn-active-capture-template ()
-  (or (zerop capture-count)
-      (progn (pop-to-buffer
-              (get-buffer
-               (car
-                (remove-if-not (lambda (b)
-                                 (let ((case-fold-search nil))
-                                   (and b
-                                        (buffer-name b)
-                                        (string-match-p "CAPTURE-.*" (buffer-name b)))))
-                               (buffer-list)))))
-             (yes-or-no-p "Active capture templates exist; exit anyway? "))))
+  ;; (or (zerop capture-count)
+  ;;     (progn (pop-to-buffer
+  ;;             (get-buffer
+  ;;              (car
+  ;;               (remove-if-not (lambda (b)
+  ;;                                (let ((case-fold-search nil))
+  ;;                                  (and b
+  ;;                                       (buffer-name b)
+  ;;                                       (string-match-p "CAPTURE-.*" (buffer-name b)))))
+  ;;                              (buffer-list)))))
+  ;;            (yes-or-no-p "Active capture templates exist; exit anyway? ")))
+  t
+  )
 
 (add-hook 'kill-emacs-query-functions
           #'warn-active-capture-template)
diff --git a/lisp/switch-tabs.el b/lisp/switch-tabs.el
index 52320be..6a437a9 100644
--- a/lisp/switch-tabs.el
+++ b/lisp/switch-tabs.el
@@ -86,9 +86,20 @@
 
 (tab-bar-rename-tab "scratch1")
 
-(add-hook 'server-after-make-frame-hook
-          #'(lambda ()
-              (tab-bar-rename-tab "scratch1")))
+(defvar tab-switch-mode-map nil)
+
+(unless tab-switch-mode-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map (kbd "s-1") #'(lambda () (interactive) (switch-or-create-tab "1")))
+    (define-key map (kbd "q") #'(lambda () (interactive) (tab-switch-mode -1)))
+    (setq tab-switch-mode-map map)))
+
+(define-minor-mode tab-switch-mode ""
+  nil nil tab-switch-mode-map :global t)
+
+;; (add-hook 'after-make-frame-functions
+;;           #'(lambda ()
+;;               (tab-bar-rename-tab "scratch1")))
 
 (provide 'switch-tabs)
 ;;; switch-tabs.el ends here