From 644e01eb21ee4f0a4c241af42fb2d89c5c97ea2f Mon Sep 17 00:00:00 2001
From: William Carroll <wpcarro@gmail.com>
Date: Mon, 31 Aug 2020 17:20:04 +0100
Subject: [PATCH] Fix fill-column errors

- removing stale comments
- dropping stale KBDs
---
 emacs/.emacs.d/wpc/window-manager.el | 3 +--
 emacs/.emacs.d/wpc/wpc-javascript.el | 6 +++++-
 emacs/.emacs.d/wpc/wpc-org.el        | 4 ----
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/emacs/.emacs.d/wpc/window-manager.el b/emacs/.emacs.d/wpc/window-manager.el
index 1e958911d..ce535e7d1 100644
--- a/emacs/.emacs.d/wpc/window-manager.el
+++ b/emacs/.emacs.d/wpc/window-manager.el
@@ -157,8 +157,7 @@
                 ;; Workspaces
                 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-                (:key ,(kbd/raw 'workspace "l") :fn window-manager-logout)
-                (:key ,(kbd/raw 'workspace "i") :fn window-manager-toggle-mode))))
+                (:key ,(kbd/raw 'workspace "l") :fn window-manager-logout))))
     (setq exwm-input-global-keys
           (->> kbds
                (-map (lambda (plist)
diff --git a/emacs/.emacs.d/wpc/wpc-javascript.el b/emacs/.emacs.d/wpc/wpc-javascript.el
index 5520f8817..0b05dd325 100644
--- a/emacs/.emacs.d/wpc/wpc-javascript.el
+++ b/emacs/.emacs.d/wpc/wpc-javascript.el
@@ -21,7 +21,11 @@
 
 ;; Constants
 (defconst wpc-javascript--js-hooks
-  '(js-mode-hook web-mode-hook typescript-mode-hook js2-mode-hook rjsx-mode-hook)
+  '(js-mode-hook
+    web-mode-hook
+    typescript-mode-hook
+    js2-mode-hook
+    rjsx-mode-hook)
   "All of the commonly used hooks for Javascript buffers.")
 
 (defconst wpc-javascript--frontend-hooks
diff --git a/emacs/.emacs.d/wpc/wpc-org.el b/emacs/.emacs.d/wpc/wpc-org.el
index eef74266e..99ccc3979 100644
--- a/emacs/.emacs.d/wpc/wpc-org.el
+++ b/emacs/.emacs.d/wpc/wpc-org.el
@@ -28,10 +28,6 @@
                           (disable company-mode)))
   (setq org-startup-folded nil)
   (setq org-todo-keywords '((sequence "TODO" "BLOCKED" "DONE")))
-  ;; TODO: troubleshoot why `wpc/kbds-minor-mode', `wpc/ensure-kbds' aren't
-  ;; enough to override the following KBDs. See this discussion for more context
-  ;; on where the idea came from:
-  ;; https://stackoverflow.com/questions/683425/globally-override-key-binding-in-emacs
   (general-unbind 'normal org-mode-map "M-h" "M-j" "M-k" "M-l"))
 
 (use-package org-bullets