From 4be7ea8effeb18002a504082096ba33bbde42d5e Mon Sep 17 00:00:00 2001 From: James Bunton Date: Tue, 15 Sep 2020 22:07:49 +1000 Subject: [PATCH] Update packages, kill some --- .gitmodules | 24 +++--------------------- lisp/my-file-modes.el | 23 ----------------------- lisp/my-keys.el | 6 ------ lisp/my-minor-modes.el | 16 ---------------- packages/ace-window | 1 - packages/async | 2 +- packages/avy | 1 - packages/coffee-mode | 2 +- packages/dash | 2 +- packages/diminish | 2 +- packages/dockerfile-mode | 2 +- packages/editorconfig | 2 +- packages/elisp-slime-nav | 2 +- packages/expand-region | 2 +- packages/flycheck | 2 +- packages/ghub | 2 +- packages/git-gutter | 2 +- packages/goto-chg | 1 - packages/groovy-modes | 2 +- packages/haskell-mode | 2 +- packages/highlight-indent-guides | 2 +- packages/hl-todo | 1 - packages/js2-mode | 2 +- packages/js2-refactor | 2 +- packages/json-mode | 2 +- packages/ledger-mode | 2 +- packages/magit | 2 +- packages/magit-popup | 2 +- packages/magit-transient | 1 + packages/markdown-mode | 2 +- packages/multiple-cursors | 2 +- packages/pkgbuild-mode | 2 +- packages/rjsx-mode | 1 - packages/s | 2 +- packages/scala-mode | 2 +- packages/shackle | 2 +- packages/slime | 2 +- packages/swiper | 2 +- packages/tide | 1 - packages/treepy | 2 +- packages/typescript-mode | 1 - packages/wgrep | 2 +- packages/with-editor | 2 +- packages/yaml-mode | 2 +- packages/yasnippet | 2 +- transient/history.el | 1 + 46 files changed, 38 insertions(+), 106 deletions(-) delete mode 160000 packages/ace-window delete mode 160000 packages/avy delete mode 160000 packages/goto-chg delete mode 160000 packages/hl-todo create mode 160000 packages/magit-transient delete mode 160000 packages/rjsx-mode delete mode 160000 packages/tide delete mode 160000 packages/typescript-mode create mode 100644 transient/history.el diff --git a/.gitmodules b/.gitmodules index 6a9729e..eb8557f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -73,18 +73,12 @@ [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 @@ -109,9 +100,6 @@ [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 @@ -133,21 +121,15 @@ [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 diff --git a/lisp/my-file-modes.el b/lisp/my-file-modes.el index 2eb9fc3..809cbcb 100644 --- a/lisp/my-file-modes.el +++ b/lisp/my-file-modes.el @@ -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) @@ -38,34 +36,13 @@ (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) diff --git a/lisp/my-keys.el b/lisp/my-keys.el index 0de61d3..8c2caec 100644 --- a/lisp/my-keys.el +++ b/lisp/my-keys.el @@ -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 "") 'windmove-up) (global-set-key (kbd "") '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) diff --git a/lisp/my-minor-modes.el b/lisp/my-minor-modes.el index 6b5f9f9..b9b6b8b 100644 --- a/lisp/my-minor-modes.el +++ b/lisp/my-minor-modes.el @@ -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 index 5b88de0..0000000 --- a/packages/ace-window +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 5b88de026cea5fc57e62bb490034392815be5f0f diff --git a/packages/async b/packages/async index d17c11e..14f48de 160000 --- a/packages/async +++ b/packages/async @@ -1 +1 @@ -Subproject commit d17c11e6082aa51f421bb037b828bdb15f405618 +Subproject commit 14f48de586b0977e3470f053b810d77b07ea427a diff --git a/packages/avy b/packages/avy deleted file mode 160000 index 24b5137..0000000 --- a/packages/avy +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 24b51374bef91cb24ec5993217187bf616fcb663 diff --git a/packages/coffee-mode b/packages/coffee-mode index 86ab8aa..35a41c7 160000 --- a/packages/coffee-mode +++ b/packages/coffee-mode @@ -1 +1 @@ -Subproject commit 86ab8aae8662e8eff54d3013010b9c693b16eac5 +Subproject commit 35a41c7d8233eac0b267d9593e67fb8b6235e134 diff --git a/packages/dash b/packages/dash index 6514359..b92ab5a 160000 --- a/packages/dash +++ b/packages/dash @@ -1 +1 @@ -Subproject commit 6514359b8606a6a9a94068ccd601fcd6379d6584 +Subproject commit b92ab5a39b987e4fe69317b9d9fda452300baf20 diff --git a/packages/diminish b/packages/diminish index 565a983..6ec6ebc 160000 --- a/packages/diminish +++ b/packages/diminish @@ -1 +1 @@ -Subproject commit 565a983a39d2e2cffab5df13b34f3b6116723208 +Subproject commit 6ec6ebc391371418efc6c98d70b013f34af5a2ee diff --git a/packages/dockerfile-mode b/packages/dockerfile-mode index 7223d92..d31f768 160000 --- a/packages/dockerfile-mode +++ b/packages/dockerfile-mode @@ -1 +1 @@ -Subproject commit 7223d92718f78fa3ab15667cdb2ed90cfeb579e7 +Subproject commit d31f7685ebc5832d957e25070a930aa42984327d diff --git a/packages/editorconfig b/packages/editorconfig index d6e48c8..9bc1343 160000 --- a/packages/editorconfig +++ b/packages/editorconfig @@ -1 +1 @@ -Subproject commit d6e48c863ed246be8894c6ee3c3c088ab4db4711 +Subproject commit 9bc1343ce8bd2cc84bf04b58a053b7ec700244c0 diff --git a/packages/elisp-slime-nav b/packages/elisp-slime-nav index 3493842..9ab5236 160000 --- a/packages/elisp-slime-nav +++ b/packages/elisp-slime-nav @@ -1 +1 @@ -Subproject commit 34938422929800839e2f935aca890cd4a229ca99 +Subproject commit 9ab52362600af9f97f1590f05a295538025170b3 diff --git a/packages/expand-region b/packages/expand-region index ed32924..ea6b4cb 160000 --- a/packages/expand-region +++ b/packages/expand-region @@ -1 +1 @@ -Subproject commit ed3292473035dc8f3d2f321e82974ef87327808f +Subproject commit ea6b4cbb9985ddae532bd2faf9bb00570c9f2781 diff --git a/packages/flycheck b/packages/flycheck index ff306e3..806f2a8 160000 --- a/packages/flycheck +++ b/packages/flycheck @@ -1 +1 @@ -Subproject commit ff306e3e69b7124b61d61dbe8b653fff67655cb0 +Subproject commit 806f2a8c21231a0dddd0a48d27fa4021729ee365 diff --git a/packages/ghub b/packages/ghub index f389fce..ca6b115 160000 --- a/packages/ghub +++ b/packages/ghub @@ -1 +1 @@ -Subproject commit f389fce41cd1bd1805bad18d12e237362af05283 +Subproject commit ca6b115c46d8ab12ae76037d4dadfc92a62a9904 diff --git a/packages/git-gutter b/packages/git-gutter index 00c0526..2c32421 160000 --- a/packages/git-gutter +++ b/packages/git-gutter @@ -1 +1 @@ -Subproject commit 00c05264af046b5ce248e5b0bc42f117d9c27a09 +Subproject commit 2c3242116a42dbbe30fc0844d1ec3c41074cdaba diff --git a/packages/goto-chg b/packages/goto-chg deleted file mode 160000 index e5b38e4..0000000 --- a/packages/goto-chg +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e5b38e4e1378f6ea48fa9e8439f49c2998654aa4 diff --git a/packages/groovy-modes b/packages/groovy-modes index f80b679..26da902 160000 --- a/packages/groovy-modes +++ b/packages/groovy-modes @@ -1 +1 @@ -Subproject commit f80b6795f645aff592ffbdc6b500084955094f5c +Subproject commit 26da902d1158c0312628d57578109be54eca2415 diff --git a/packages/haskell-mode b/packages/haskell-mode index 4aa8875..e688ed4 160000 --- a/packages/haskell-mode +++ b/packages/haskell-mode @@ -1 +1 @@ -Subproject commit 4aa88752ab23bca3ded36a9c9fd9c34cffbb129b +Subproject commit e688ed4e265aeea61f38835359e55f7df1ffdd65 diff --git a/packages/highlight-indent-guides b/packages/highlight-indent-guides index fc99ee7..cf352c8 160000 --- a/packages/highlight-indent-guides +++ b/packages/highlight-indent-guides @@ -1 +1 @@ -Subproject commit fc99ee753ac9d53ce91fb032f97430a551e04466 +Subproject commit cf352c85cd15dd18aa096ba9d9ab9b7ab493e8f6 diff --git a/packages/hl-todo b/packages/hl-todo deleted file mode 160000 index 24b9925..0000000 --- a/packages/hl-todo +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 24b9925b1b2c7ad6bf7b66800395f74abf035c5f diff --git a/packages/js2-mode b/packages/js2-mode index 5165f4d..40aab27 160000 --- a/packages/js2-mode +++ b/packages/js2-mode @@ -1 +1 @@ -Subproject commit 5165f4dc3805add174e48f0d64c5617d10ac3507 +Subproject commit 40aab27581279d0fdbfeb9afeb85f39d401a927f diff --git a/packages/js2-refactor b/packages/js2-refactor index 79124b3..d4c40b5 160000 --- a/packages/js2-refactor +++ b/packages/js2-refactor @@ -1 +1 @@ -Subproject commit 79124b3274c43ad1f9ec6205fa362576552db02f +Subproject commit d4c40b5fc86d3edd7c6a7d83ac86483ee1cb7a28 diff --git a/packages/json-mode b/packages/json-mode index ffc92b1..0e819e5 160000 --- a/packages/json-mode +++ b/packages/json-mode @@ -1 +1 @@ -Subproject commit ffc92b1eefc54963703b43be140f4c8c8ad348f7 +Subproject commit 0e819e519ae17a2686e0881c4ca51fa873fa9b83 diff --git a/packages/ledger-mode b/packages/ledger-mode index ccb0bcf..805507f 160000 --- a/packages/ledger-mode +++ b/packages/ledger-mode @@ -1 +1 @@ -Subproject commit ccb0bcf938761fc4f066fee5c6259772b872e5eb +Subproject commit 805507fd6c14839be4efc7aee2017f9c03e36834 diff --git a/packages/magit b/packages/magit index e52162d..d58d520 160000 --- a/packages/magit +++ b/packages/magit @@ -1 +1 @@ -Subproject commit e52162dc9254e42b66cd37903a236a9265496142 +Subproject commit d58d520e586b70172601ee2814a5e053ca74d1d9 diff --git a/packages/magit-popup b/packages/magit-popup index 8436447..d8585fa 160000 --- a/packages/magit-popup +++ b/packages/magit-popup @@ -1 +1 @@ -Subproject commit 8436447e3166b797edc596cf220f3bf9b41ff4d0 +Subproject commit d8585fa39f88956963d877b921322530257ba9f5 diff --git a/packages/magit-transient b/packages/magit-transient new file mode 160000 index 0000000..f5d81ef --- /dev/null +++ b/packages/magit-transient @@ -0,0 +1 @@ +Subproject commit f5d81ef0ed24be935f3c0192b746a1738d903d37 diff --git a/packages/markdown-mode b/packages/markdown-mode index d18a8f8..8c6775a 160000 --- a/packages/markdown-mode +++ b/packages/markdown-mode @@ -1 +1 @@ -Subproject commit d18a8f856d19dfac8fa6e6e72b2448e262045fcc +Subproject commit 8c6775a000bf40d7c7b35a529011a99231a4a4f7 diff --git a/packages/multiple-cursors b/packages/multiple-cursors index 6a7c3c0..b880554 160000 --- a/packages/multiple-cursors +++ b/packages/multiple-cursors @@ -1 +1 @@ -Subproject commit 6a7c3c0853e3fe9e4b8e5985dbed8fd4075f33ff +Subproject commit b880554d04b8f61165afba7d4de19ac9e39bb7ab diff --git a/packages/pkgbuild-mode b/packages/pkgbuild-mode index c27b65c..887c01c 160000 --- a/packages/pkgbuild-mode +++ b/packages/pkgbuild-mode @@ -1 +1 @@ -Subproject commit c27b65c3deb116b296cef013f342159d9dec5c11 +Subproject commit 887c01cb06420501c7780fb01a8a76bdb0864cca diff --git a/packages/rjsx-mode b/packages/rjsx-mode deleted file mode 160000 index 89358fd..0000000 --- a/packages/rjsx-mode +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 89358fd230878a19e3232a3e4ce21b7fb608faae diff --git a/packages/s b/packages/s index 03410e6..43ba8b5 160000 --- a/packages/s +++ b/packages/s @@ -1 +1 @@ -Subproject commit 03410e6a7a2b11e47e1fea3b7d9899c7df26435e +Subproject commit 43ba8b563bee3426cead0e6d4ddc09398e1a349d diff --git a/packages/scala-mode b/packages/scala-mode index 56cba29..1d08e88 160000 --- a/packages/scala-mode +++ b/packages/scala-mode @@ -1 +1 @@ -Subproject commit 56cba2903cf6e12c715dbb5c99b34c97b2679379 +Subproject commit 1d08e885b1489313666c7f15a3962432a4f757ee diff --git a/packages/shackle b/packages/shackle index 4189c1c..171c3f4 160000 --- a/packages/shackle +++ b/packages/shackle @@ -1 +1 @@ -Subproject commit 4189c1c773aab533969b587f7801ffbcd1d7d613 +Subproject commit 171c3f437d853f34782b201d86ef765665b755e2 diff --git a/packages/slime b/packages/slime index 29125e9..fb12bac 160000 --- a/packages/slime +++ b/packages/slime @@ -1 +1 @@ -Subproject commit 29125e9824f36a9713be16d70dccec614ab660a7 +Subproject commit fb12bac676ab51b75be19197e21ab4674479d627 diff --git a/packages/swiper b/packages/swiper index 9862640..7e4c567 160000 --- a/packages/swiper +++ b/packages/swiper @@ -1 +1 @@ -Subproject commit 986264097ff85a82cc9b369299a70167a47f2f62 +Subproject commit 7e4c56776f811f78b8eb95210156f8fbbdba67e7 diff --git a/packages/tide b/packages/tide deleted file mode 160000 index 9556b44..0000000 --- a/packages/tide +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 9556b440c84b3ae05c6aab768c7d83cdc74e5493 diff --git a/packages/treepy b/packages/treepy index b40e6b0..3ac940e 160000 --- a/packages/treepy +++ b/packages/treepy @@ -1 +1 @@ -Subproject commit b40e6b09eb9be45da67b8c9e4990a5a0d7a2a09d +Subproject commit 3ac940e97f3d03e48ca9d7fcd74916a9b01c72f3 diff --git a/packages/typescript-mode b/packages/typescript-mode deleted file mode 160000 index fbaad51..0000000 --- a/packages/typescript-mode +++ /dev/null @@ -1 +0,0 @@ -Subproject commit fbaad515c90df0f5c3634c471034e3041a4a8cfc diff --git a/packages/wgrep b/packages/wgrep index 414be70..f0ef9bf 160000 --- a/packages/wgrep +++ b/packages/wgrep @@ -1 +1 @@ -Subproject commit 414be70bd313e482cd9f0b70fd2daad4ee23497c +Subproject commit f0ef9bfa44db503cdb2f83fcfbd2fa4e2382ef1f diff --git a/packages/with-editor b/packages/with-editor index 9dd9f17..efafd48 160000 --- a/packages/with-editor +++ b/packages/with-editor @@ -1 +1 @@ -Subproject commit 9dd9f176d96abc60365369de6d08c26c414ef1f3 +Subproject commit efafd482c21b90decbb0b682ed3159c86014d4f3 diff --git a/packages/yaml-mode b/packages/yaml-mode index 40067a1..68fecb5 160000 --- a/packages/yaml-mode +++ b/packages/yaml-mode @@ -1 +1 @@ -Subproject commit 40067a10ac1360f0b9533f0bbbb2eea128e2574d +Subproject commit 68fecb5f0dec712a10c8655df6881392a4613617 diff --git a/packages/yasnippet b/packages/yasnippet index 1d96da2..5cbdbf0 160000 --- a/packages/yasnippet +++ b/packages/yasnippet @@ -1 +1 @@ -Subproject commit 1d96da2e08664c31ff7f6f7441da1f4fa5680b1f +Subproject commit 5cbdbf0d2015540c59ed8ee0fcf4788effdf75b6 diff --git a/transient/history.el b/transient/history.el new file mode 100644 index 0000000..90b5a84 --- /dev/null +++ b/transient/history.el @@ -0,0 +1 @@ +nil \ No newline at end of file -- 2.39.2