From a9674790d13a981cb95e4608765c843861e2c368 Mon Sep 17 00:00:00 2001 From: Amin Bandali Date: Wed, 7 Nov 2018 20:50:52 -0500 Subject: [emacs] update 7 drones, remove meghanada, note lsp-java deps lib/epkg master v3.1.1-1-gc42bc98 lib/ghub master v3.0.0-3-g1abe6ff lib/highlight-indent-guides master fc99ee7 lib/magit master 2.13.0-387-gad130229 lib/ox-hugo master v0.8-437-g7fb284e lib/projectile master v1.0.0-204-gaa74ae1 lib/slack master b853a34 --- .gitmodules | 3 --- init.org | 21 +++++++++++++++++++-- lib/epkg | 2 +- lib/ghub | 2 +- lib/highlight-indent-guides | 2 +- lib/magit | 2 +- lib/meghanada | 1 - lib/ox-hugo | 2 +- lib/projectile | 2 +- lib/slack | 2 +- 10 files changed, 26 insertions(+), 13 deletions(-) delete mode 160000 lib/meghanada diff --git a/.gitmodules b/.gitmodules index af3aedc..db55daa 100644 --- a/.gitmodules +++ b/.gitmodules @@ -164,9 +164,6 @@ [submodule "markdown-mode"] path = lib/markdown-mode url = git@github.com:jrblevin/markdown-mode.git -[submodule "meghanada"] - path = lib/meghanada - url = git@github.com:mopemope/meghanada-emacs.git [submodule "memoize"] path = lib/memoize url = git@github.com:skeeto/emacs-memoize.git diff --git a/init.org b/init.org index 8de3fb8..0a9434c 100644 --- a/init.org +++ b/init.org @@ -1400,7 +1400,7 @@ instead. *** meghanada -#+begin_src emacs-lisp :tangle yes +#+begin_src emacs-lisp :tangle no (use-package meghanada :bind (:map meghanada-mode-map @@ -1411,8 +1411,25 @@ instead. *** lsp-java +#+begin_comment +dependencies: + +ace-window +avy +bui +company-lsp +dap-mode +lsp-java +lsp-mode +lsp-ui +pfuture +tree-mode +treemacs +#+end_comment + #+begin_src emacs-lisp :tangle no -(use-package treemacs) +(use-package treemacs + :config (setq treemacs-never-persist t)) (use-package yasnippet :config diff --git a/lib/epkg b/lib/epkg index 5bc1b75..c42bc98 160000 --- a/lib/epkg +++ b/lib/epkg @@ -1 +1 @@ -Subproject commit 5bc1b7515cc444b6ae9f7af7a208d77531cfb406 +Subproject commit c42bc98a711ffa8d2a7b9096b563ac0edb0b9bf3 diff --git a/lib/ghub b/lib/ghub index 8b8ae5c..1abe6ff 160000 --- a/lib/ghub +++ b/lib/ghub @@ -1 +1 @@ -Subproject commit 8b8ae5c8df048d7e1971d09f8b47361b532d2df0 +Subproject commit 1abe6ff076cc2e7949faf5172c59a1f94b1e0e5a diff --git a/lib/highlight-indent-guides b/lib/highlight-indent-guides index e463564..fc99ee7 160000 --- a/lib/highlight-indent-guides +++ b/lib/highlight-indent-guides @@ -1 +1 @@ -Subproject commit e46356487d4b19144af3025cf16f1b1bd174a450 +Subproject commit fc99ee753ac9d53ce91fb032f97430a551e04466 diff --git a/lib/magit b/lib/magit index 9ff2663..ad13022 160000 --- a/lib/magit +++ b/lib/magit @@ -1 +1 @@ -Subproject commit 9ff2663580bcfe5f49dd418610dc4c0c017ba75a +Subproject commit ad130229cbde10af16276f0ef2882aa7a5f40170 diff --git a/lib/meghanada b/lib/meghanada deleted file mode 160000 index 0b36871..0000000 --- a/lib/meghanada +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 0b36871f1537921e1819a84f99f3fb9571831751 diff --git a/lib/ox-hugo b/lib/ox-hugo index 99e7715..7fb284e 160000 --- a/lib/ox-hugo +++ b/lib/ox-hugo @@ -1 +1 @@ -Subproject commit 99e77158bfab545dfd1a3d71cfd2698195a65653 +Subproject commit 7fb284ec4b7f47ff1286598220650c5b24b56b45 diff --git a/lib/projectile b/lib/projectile index 8c2e260..aa74ae1 160000 --- a/lib/projectile +++ b/lib/projectile @@ -1 +1 @@ -Subproject commit 8c2e260565b5b9460895dffbce5ebc5c7d687f71 +Subproject commit aa74ae12bbb73581a9f2d0e868720f9b69aa2017 diff --git a/lib/slack b/lib/slack index ef3956a..b853a34 160000 --- a/lib/slack +++ b/lib/slack @@ -1 +1 @@ -Subproject commit ef3956a80c5521b5fb91e65947ab0af40222b10d +Subproject commit b853a34dbe21a869af1ed353dffe0de2dea2f049 -- cgit v1.2.3-60-g2f50