]> code.delx.au - dotemacs/commitdiff
Update packages, kill some
authorJames Bunton <jamesbunton@delx.net.au>
Tue, 15 Sep 2020 12:07:49 +0000 (22:07 +1000)
committerJames Bunton <jamesbunton@delx.net.au>
Tue, 15 Sep 2020 12:07:49 +0000 (22:07 +1000)
46 files changed:
.gitmodules
lisp/my-file-modes.el
lisp/my-keys.el
lisp/my-minor-modes.el
packages/ace-window [deleted submodule]
packages/async
packages/avy [deleted submodule]
packages/coffee-mode
packages/dash
packages/diminish
packages/dockerfile-mode
packages/editorconfig
packages/elisp-slime-nav
packages/expand-region
packages/flycheck
packages/ghub
packages/git-gutter
packages/goto-chg [deleted submodule]
packages/groovy-modes
packages/haskell-mode
packages/highlight-indent-guides
packages/hl-todo [deleted submodule]
packages/js2-mode
packages/js2-refactor
packages/json-mode
packages/ledger-mode
packages/magit
packages/magit-popup
packages/magit-transient [new submodule]
packages/markdown-mode
packages/multiple-cursors
packages/pkgbuild-mode
packages/rjsx-mode [deleted submodule]
packages/s
packages/scala-mode
packages/shackle
packages/slime
packages/swiper
packages/tide [deleted submodule]
packages/treepy
packages/typescript-mode [deleted submodule]
packages/wgrep
packages/with-editor
packages/yaml-mode
packages/yasnippet
transient/history.el [new file with mode: 0644]

index 6a9729ed7fecd8935b4ae0cebae901b23a1f559b..eb8557ff3292b85e0b1b59dfdfecb2d264dd8755 100644 (file)
 [submodule "direx"]
        path = packages/direx
        url = https://github.com/m2ym/direx-el.git
-[submodule "avy"]
-       path = packages/avy
-       url = https://github.com/abo-abo/avy.git
 [submodule "git-gutter"]
        path = packages/git-gutter
        url = https://github.com/syohex/emacs-git-gutter.git
 [submodule "shackle"]
        path = packages/shackle
        url = https://github.com/wasamasa/shackle.git
-[submodule "hl-todo"]
-       path = packages/hl-todo
-       url = https://github.com/tarsius/hl-todo.git
 [submodule "magit"]
        path = packages/magit
        url = https://github.com/magit/magit.git
@@ -97,9 +91,6 @@
 [submodule "elisp-slime-nav"]
        path = packages/elisp-slime-nav
        url = https://github.com/purcell/elisp-slime-nav.git
-[submodule "ace-window"]
-       path = packages/ace-window
-       url = https://github.com/abo-abo/ace-window.git
 [submodule "packages/ssh-file-modes"]
        path = packages/ssh-file-modes
        url = https://github.com/petere/emacs-ssh-file-modes.git
 [submodule "highlight-symbol"]
        path = packages/highlight-symbol
        url = https://github.com/nschum/highlight-symbol.el.git
-[submodule "goto-chg"]
-       path = packages/goto-chg
-       url = https://github.com/emacs-evil/goto-chg.git
 [submodule "s"]
        path = packages/s
        url = https://github.com/magnars/s.el.git
 [submodule "ghub"]
        path = packages/ghub
        url = https://github.com/magit/ghub.git
-[submodule "typescript-mode"]
-       path = packages/typescript-mode
-       url = https://github.com/ananthakumaran/typescript.el.git
-[submodule "tide"]
-       path = packages/tide
-       url = https://github.com/ananthakumaran/tide.git
 [submodule "highlight-indent-guides"]
        path = packages/highlight-indent-guides
        url = https://github.com/DarthFennec/highlight-indent-guides.git
-[submodule "rjsx-mode"]
-       path = packages/rjsx-mode
-       url = https://github.com/felipeochoa/rjsx-mode.git
 [submodule "graphql"]
        path = packages/graphql
        url = https://github.com/vermiculus/graphql.el.git
 [submodule "treepy"]
        path = packages/treepy
        url = https://github.com/volrath/treepy.el
+[submodule "magit-transient"]
+       path = packages/magit-transient
+       url = https://github.com/magit/transient.git
index 2eb9fc393ea282f7c05053968ee0e5161f758d47..809cbcbd07b7a15ff6bdeeeda177135b3246d65e 100644 (file)
@@ -27,8 +27,6 @@
 (require 'json-mode)
 (require 'js)
 (require 'js2-mode)
-(require 'typescript-mode)
-;; (require 'tide)
 (add-to-list 'auto-mode-alist '("\\.js\\'" . js2-mode))
 (add-to-list 'interpreter-mode-alist '("node" . js2-mode))
 (setq js2-concat-multiline-strings 'eol)
 (setq js--declaration-keyword-re "x^") ; declarations should have normal indentation
 (setq js-indent-align-list-continuation nil)
 
-;; (add-hook 'js2-mode-hook #'tide-setup)
 (add-hook 'js2-mode-hook #'js2-refactor-mode)
-;; (add-hook 'typescript-mode-hook #'tide-setup)
-(add-hook 'typescript-mode-hook #'js2-refactor-mode)
-
-(defun tide-project-root ()
-  (or
-   tide-project-root
-   (let ((root (or (locate-dominating-file default-directory "tsconfig.json")
-                   (locate-dominating-file default-directory "jsconfig.json")
-                   (locate-dominating-file default-directory ".git")
-                   (locate-dominating-file default-directory "package.json"))))
-     (unless root
-       (message (tide-join (list "Couldn't locate JavaScript project root folder. Using '" default-directory "' as project root.")))
-       (setq root default-directory))
-     (let ((full-path (expand-file-name root)))
-       (setq tide-project-root full-path)
-       full-path))))
 
 (require 'js2-refactor)
 (js2r-add-keybindings-with-prefix "C-c C-m")
 (setq js2r-always-insert-parens-around-arrow-function-params t)
 (setq js2r-prefered-quote-type 2)
 
-(require 'rjsx-mode)
-(add-to-list 'auto-mode-alist '("\\.tsx\\'" . js2-jsx-mode))
-
-
 (require 'ledger-mode nil 'noerror)
 (add-to-list 'auto-mode-alist '("\\.ledger\\'" . ledger-mode))
 (setq ledger-post-amount-alignment-column 72)
index 0de61d399000d041f4f392480cc5c74834ce593b..8c2caecb1772601d5c646df944748cc539f8d781 100644 (file)
@@ -22,7 +22,6 @@
 (global-set-key (kbd "C-c g r") 'git-gutter:revert-hunk)
 
 ;; Windows/frames
-(global-set-key (kbd "C-x o") 'ace-window)
 (global-set-key (kbd "C-x 9") 'my/window-resize-mode)
 (global-set-key (kbd "<C-up>") 'windmove-up)
 (global-set-key (kbd "<C-down>") 'windmove-down)
@@ -31,9 +30,6 @@
 
 ;; Movement
 (global-set-key (kbd "M-g f") 'jump-char-forward)
-(global-set-key (kbd "M-g g") 'avy-goto-line)
-(global-set-key (kbd "M-g M-g") 'avy-goto-line)
-(global-set-key (kbd "M-g j") 'avy-goto-word-1)
 
 ;; Text formatting
 (global-set-key (kbd "M-/") 'hippie-expand)
@@ -51,8 +47,6 @@
 (global-set-key (kbd "C-c m m") 'mc/mark-more-like-this-extended)
 (global-set-key (kbd "C-c m p") 'mc/mark-previous-like-this)
 (global-set-key (kbd "C-c m n") 'mc/mark-next-like-this)
-(global-set-key (kbd "C-.") 'goto-last-change)
-(global-set-key (kbd "C-,") 'goto-last-change-reverse)
 
 ;; Killing and deleting
 (global-set-key (kbd "M-z") 'zap-up-to-char)
index 6b5f9f9735e2036f9b6d62cdf9088f2886392e81..b9b6b8b5d15b8542ffee14a86ebba7f1d95ad541 100644 (file)
@@ -1,21 +1,10 @@
 ;;; -*- lexical-binding: t -*-
 
-(require 'ace-window)
-(setq aw-scope 'frame)
-(setq aw-keys '(?h ?t ?n ?s))
-
 (require 'autorevert)
 (global-auto-revert-mode 1)
 (setq global-auto-revert-non-file-buffers t)
 (setq auto-revert-verbose nil)
 
-(require 'avy)
-(setq avy-background t)
-(setq avy-all-windows nil)
-(setq avy-timeout-seconds 0.3)
-(setq avy-keys '(?a ?o ?e ?u ?h ?t ?n ?s))
-(setq avy-style 'at)
-
 (require 'change-inner)
 
 (require 'editorconfig)
@@ -38,8 +27,6 @@
         (define-key m (kbd "C-c RET") 'goto-address-at-point)
         m))
 
-(require 'goto-chg)
-
 (require 'highlight-indent-guides)
 (add-hook 'prog-mode-hook 'highlight-indent-guides-mode)
 (setq highlight-indent-guides-method 'character)
@@ -56,9 +43,6 @@
 (require 'hl-line)
 (global-hl-line-mode)
 
-(require 'hl-todo)
-(global-hl-todo-mode)
-
 (require 'jump-char)
 
 (require 'flyspell)
diff --git a/packages/ace-window b/packages/ace-window
deleted file mode 160000 (submodule)
index 5b88de0..0000000
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 5b88de026cea5fc57e62bb490034392815be5f0f
index d17c11e6082aa51f421bb037b828bdb15f405618..14f48de586b0977e3470f053b810d77b07ea427a 160000 (submodule)
@@ -1 +1 @@
-Subproject commit d17c11e6082aa51f421bb037b828bdb15f405618
+Subproject commit 14f48de586b0977e3470f053b810d77b07ea427a
diff --git a/packages/avy b/packages/avy
deleted file mode 160000 (submodule)
index 24b5137..0000000
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 24b51374bef91cb24ec5993217187bf616fcb663
index 86ab8aae8662e8eff54d3013010b9c693b16eac5..35a41c7d8233eac0b267d9593e67fb8b6235e134 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 86ab8aae8662e8eff54d3013010b9c693b16eac5
+Subproject commit 35a41c7d8233eac0b267d9593e67fb8b6235e134
index 6514359b8606a6a9a94068ccd601fcd6379d6584..b92ab5a39b987e4fe69317b9d9fda452300baf20 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 6514359b8606a6a9a94068ccd601fcd6379d6584
+Subproject commit b92ab5a39b987e4fe69317b9d9fda452300baf20
index 565a983a39d2e2cffab5df13b34f3b6116723208..6ec6ebc391371418efc6c98d70b013f34af5a2ee 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 565a983a39d2e2cffab5df13b34f3b6116723208
+Subproject commit 6ec6ebc391371418efc6c98d70b013f34af5a2ee
index 7223d92718f78fa3ab15667cdb2ed90cfeb579e7..d31f7685ebc5832d957e25070a930aa42984327d 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 7223d92718f78fa3ab15667cdb2ed90cfeb579e7
+Subproject commit d31f7685ebc5832d957e25070a930aa42984327d
index d6e48c863ed246be8894c6ee3c3c088ab4db4711..9bc1343ce8bd2cc84bf04b58a053b7ec700244c0 160000 (submodule)
@@ -1 +1 @@
-Subproject commit d6e48c863ed246be8894c6ee3c3c088ab4db4711
+Subproject commit 9bc1343ce8bd2cc84bf04b58a053b7ec700244c0
index 34938422929800839e2f935aca890cd4a229ca99..9ab52362600af9f97f1590f05a295538025170b3 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 34938422929800839e2f935aca890cd4a229ca99
+Subproject commit 9ab52362600af9f97f1590f05a295538025170b3
index ed3292473035dc8f3d2f321e82974ef87327808f..ea6b4cbb9985ddae532bd2faf9bb00570c9f2781 160000 (submodule)
@@ -1 +1 @@
-Subproject commit ed3292473035dc8f3d2f321e82974ef87327808f
+Subproject commit ea6b4cbb9985ddae532bd2faf9bb00570c9f2781
index ff306e3e69b7124b61d61dbe8b653fff67655cb0..806f2a8c21231a0dddd0a48d27fa4021729ee365 160000 (submodule)
@@ -1 +1 @@
-Subproject commit ff306e3e69b7124b61d61dbe8b653fff67655cb0
+Subproject commit 806f2a8c21231a0dddd0a48d27fa4021729ee365
index f389fce41cd1bd1805bad18d12e237362af05283..ca6b115c46d8ab12ae76037d4dadfc92a62a9904 160000 (submodule)
@@ -1 +1 @@
-Subproject commit f389fce41cd1bd1805bad18d12e237362af05283
+Subproject commit ca6b115c46d8ab12ae76037d4dadfc92a62a9904
index 00c05264af046b5ce248e5b0bc42f117d9c27a09..2c3242116a42dbbe30fc0844d1ec3c41074cdaba 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 00c05264af046b5ce248e5b0bc42f117d9c27a09
+Subproject commit 2c3242116a42dbbe30fc0844d1ec3c41074cdaba
diff --git a/packages/goto-chg b/packages/goto-chg
deleted file mode 160000 (submodule)
index e5b38e4..0000000
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit e5b38e4e1378f6ea48fa9e8439f49c2998654aa4
index f80b6795f645aff592ffbdc6b500084955094f5c..26da902d1158c0312628d57578109be54eca2415 160000 (submodule)
@@ -1 +1 @@
-Subproject commit f80b6795f645aff592ffbdc6b500084955094f5c
+Subproject commit 26da902d1158c0312628d57578109be54eca2415
index 4aa88752ab23bca3ded36a9c9fd9c34cffbb129b..e688ed4e265aeea61f38835359e55f7df1ffdd65 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 4aa88752ab23bca3ded36a9c9fd9c34cffbb129b
+Subproject commit e688ed4e265aeea61f38835359e55f7df1ffdd65
index fc99ee753ac9d53ce91fb032f97430a551e04466..cf352c85cd15dd18aa096ba9d9ab9b7ab493e8f6 160000 (submodule)
@@ -1 +1 @@
-Subproject commit fc99ee753ac9d53ce91fb032f97430a551e04466
+Subproject commit cf352c85cd15dd18aa096ba9d9ab9b7ab493e8f6
diff --git a/packages/hl-todo b/packages/hl-todo
deleted file mode 160000 (submodule)
index 24b9925..0000000
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 24b9925b1b2c7ad6bf7b66800395f74abf035c5f
index 5165f4dc3805add174e48f0d64c5617d10ac3507..40aab27581279d0fdbfeb9afeb85f39d401a927f 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 5165f4dc3805add174e48f0d64c5617d10ac3507
+Subproject commit 40aab27581279d0fdbfeb9afeb85f39d401a927f
index 79124b3274c43ad1f9ec6205fa362576552db02f..d4c40b5fc86d3edd7c6a7d83ac86483ee1cb7a28 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 79124b3274c43ad1f9ec6205fa362576552db02f
+Subproject commit d4c40b5fc86d3edd7c6a7d83ac86483ee1cb7a28
index ffc92b1eefc54963703b43be140f4c8c8ad348f7..0e819e519ae17a2686e0881c4ca51fa873fa9b83 160000 (submodule)
@@ -1 +1 @@
-Subproject commit ffc92b1eefc54963703b43be140f4c8c8ad348f7
+Subproject commit 0e819e519ae17a2686e0881c4ca51fa873fa9b83
index ccb0bcf938761fc4f066fee5c6259772b872e5eb..805507fd6c14839be4efc7aee2017f9c03e36834 160000 (submodule)
@@ -1 +1 @@
-Subproject commit ccb0bcf938761fc4f066fee5c6259772b872e5eb
+Subproject commit 805507fd6c14839be4efc7aee2017f9c03e36834
index e52162dc9254e42b66cd37903a236a9265496142..d58d520e586b70172601ee2814a5e053ca74d1d9 160000 (submodule)
@@ -1 +1 @@
-Subproject commit e52162dc9254e42b66cd37903a236a9265496142
+Subproject commit d58d520e586b70172601ee2814a5e053ca74d1d9
index 8436447e3166b797edc596cf220f3bf9b41ff4d0..d8585fa39f88956963d877b921322530257ba9f5 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 8436447e3166b797edc596cf220f3bf9b41ff4d0
+Subproject commit d8585fa39f88956963d877b921322530257ba9f5
diff --git a/packages/magit-transient b/packages/magit-transient
new file mode 160000 (submodule)
index 0000000..f5d81ef
--- /dev/null
@@ -0,0 +1 @@
+Subproject commit f5d81ef0ed24be935f3c0192b746a1738d903d37
index d18a8f856d19dfac8fa6e6e72b2448e262045fcc..8c6775a000bf40d7c7b35a529011a99231a4a4f7 160000 (submodule)
@@ -1 +1 @@
-Subproject commit d18a8f856d19dfac8fa6e6e72b2448e262045fcc
+Subproject commit 8c6775a000bf40d7c7b35a529011a99231a4a4f7
index 6a7c3c0853e3fe9e4b8e5985dbed8fd4075f33ff..b880554d04b8f61165afba7d4de19ac9e39bb7ab 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 6a7c3c0853e3fe9e4b8e5985dbed8fd4075f33ff
+Subproject commit b880554d04b8f61165afba7d4de19ac9e39bb7ab
index c27b65c3deb116b296cef013f342159d9dec5c11..887c01cb06420501c7780fb01a8a76bdb0864cca 160000 (submodule)
@@ -1 +1 @@
-Subproject commit c27b65c3deb116b296cef013f342159d9dec5c11
+Subproject commit 887c01cb06420501c7780fb01a8a76bdb0864cca
diff --git a/packages/rjsx-mode b/packages/rjsx-mode
deleted file mode 160000 (submodule)
index 89358fd..0000000
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 89358fd230878a19e3232a3e4ce21b7fb608faae
index 03410e6a7a2b11e47e1fea3b7d9899c7df26435e..43ba8b563bee3426cead0e6d4ddc09398e1a349d 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 03410e6a7a2b11e47e1fea3b7d9899c7df26435e
+Subproject commit 43ba8b563bee3426cead0e6d4ddc09398e1a349d
index 56cba2903cf6e12c715dbb5c99b34c97b2679379..1d08e885b1489313666c7f15a3962432a4f757ee 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 56cba2903cf6e12c715dbb5c99b34c97b2679379
+Subproject commit 1d08e885b1489313666c7f15a3962432a4f757ee
index 4189c1c773aab533969b587f7801ffbcd1d7d613..171c3f437d853f34782b201d86ef765665b755e2 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 4189c1c773aab533969b587f7801ffbcd1d7d613
+Subproject commit 171c3f437d853f34782b201d86ef765665b755e2
index 29125e9824f36a9713be16d70dccec614ab660a7..fb12bac676ab51b75be19197e21ab4674479d627 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 29125e9824f36a9713be16d70dccec614ab660a7
+Subproject commit fb12bac676ab51b75be19197e21ab4674479d627
index 986264097ff85a82cc9b369299a70167a47f2f62..7e4c56776f811f78b8eb95210156f8fbbdba67e7 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 986264097ff85a82cc9b369299a70167a47f2f62
+Subproject commit 7e4c56776f811f78b8eb95210156f8fbbdba67e7
diff --git a/packages/tide b/packages/tide
deleted file mode 160000 (submodule)
index 9556b44..0000000
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 9556b440c84b3ae05c6aab768c7d83cdc74e5493
index b40e6b09eb9be45da67b8c9e4990a5a0d7a2a09d..3ac940e97f3d03e48ca9d7fcd74916a9b01c72f3 160000 (submodule)
@@ -1 +1 @@
-Subproject commit b40e6b09eb9be45da67b8c9e4990a5a0d7a2a09d
+Subproject commit 3ac940e97f3d03e48ca9d7fcd74916a9b01c72f3
diff --git a/packages/typescript-mode b/packages/typescript-mode
deleted file mode 160000 (submodule)
index fbaad51..0000000
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit fbaad515c90df0f5c3634c471034e3041a4a8cfc
index 414be70bd313e482cd9f0b70fd2daad4ee23497c..f0ef9bfa44db503cdb2f83fcfbd2fa4e2382ef1f 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 414be70bd313e482cd9f0b70fd2daad4ee23497c
+Subproject commit f0ef9bfa44db503cdb2f83fcfbd2fa4e2382ef1f
index 9dd9f176d96abc60365369de6d08c26c414ef1f3..efafd482c21b90decbb0b682ed3159c86014d4f3 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 9dd9f176d96abc60365369de6d08c26c414ef1f3
+Subproject commit efafd482c21b90decbb0b682ed3159c86014d4f3
index 40067a10ac1360f0b9533f0bbbb2eea128e2574d..68fecb5f0dec712a10c8655df6881392a4613617 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 40067a10ac1360f0b9533f0bbbb2eea128e2574d
+Subproject commit 68fecb5f0dec712a10c8655df6881392a4613617
index 1d96da2e08664c31ff7f6f7441da1f4fa5680b1f..5cbdbf0d2015540c59ed8ee0fcf4788effdf75b6 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 1d96da2e08664c31ff7f6f7441da1f4fa5680b1f
+Subproject commit 5cbdbf0d2015540c59ed8ee0fcf4788effdf75b6
diff --git a/transient/history.el b/transient/history.el
new file mode 100644 (file)
index 0000000..90b5a84
--- /dev/null
@@ -0,0 +1 @@
+nil
\ No newline at end of file