From dcb1893fba9f6eeb6769cefcec442e04e27867f6 Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Thu, 27 Dec 2018 13:07:24 +0100 Subject: [PATCH 1/5] Remove magithub and dependencies Remove apiwrap Remove ghub+ Remove magithub Remove s --- .gitmodules | 12 ------------ init.el | 5 ----- lib/apiwrap | 1 - lib/ghub+ | 1 - lib/magithub | 1 - lib/s | 1 - 6 files changed, 21 deletions(-) delete mode 160000 lib/apiwrap delete mode 160000 lib/ghub+ delete mode 160000 lib/magithub delete mode 160000 lib/s diff --git a/.gitmodules b/.gitmodules index d44094c..0975323 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,6 @@ [borg] pushDefault = locutus collective = emacsg -[submodule "apiwrap"] - path = lib/apiwrap - url = git@github.com:vermiculus/apiwrap.el.git [submodule "auto-compile"] path = lib/auto-compile url = git@github.com:emacscollective/auto-compile.git @@ -30,9 +27,6 @@ [submodule "ghub"] path = lib/ghub url = git@github.com:magit/ghub.git -[submodule "ghub+"] - path = lib/ghub+ - url = git@github.com:vermiculus/ghub-plus.git [submodule "git-modes"] path = lib/git-modes url = git@github.com:magit/git-modes.git @@ -53,9 +47,6 @@ [submodule "magit-tbdiff"] path = lib/magit-tbdiff url = git@github.com:magit/magit-tbdiff.git -[submodule "magithub"] - path = lib/magithub - url = git@github.com:vermiculus/magithub.git [submodule "markdown-mode"] path = lib/markdown-mode url = git@github.com:jrblevin/markdown-mode.git @@ -65,9 +56,6 @@ [submodule "packed"] path = lib/packed url = git@github.com:emacscollective/packed.git -[submodule "s"] - path = lib/s - url = git@github.com:magnars/s.el.git [submodule "treepy"] path = lib/treepy url = git@github.com:volrath/treepy.el.git diff --git a/init.el b/init.el index d3d1cee..1ed2e86 100644 --- a/init.el +++ b/init.el @@ -202,11 +202,6 @@ (magit-wip-after-apply-mode) (magit-wip-after-save-mode)) -(use-package magithub - :after magit - :config - (magithub-feature-autoinject t)) - (use-package man :defer t :config (setq Man-width 80)) diff --git a/lib/apiwrap b/lib/apiwrap deleted file mode 160000 index e4c9c57..0000000 --- a/lib/apiwrap +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e4c9c57d6620a788ec8a715ff1bb50542edea3a6 diff --git a/lib/ghub+ b/lib/ghub+ deleted file mode 160000 index 51ebffe..0000000 --- a/lib/ghub+ +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 51ebffe549286b3c0b0565a373f44f4d64fc57af diff --git a/lib/magithub b/lib/magithub deleted file mode 160000 index 9d48e74..0000000 --- a/lib/magithub +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 9d48e74e4ee490ac0e808605b29c01527657af86 diff --git a/lib/s b/lib/s deleted file mode 160000 index 03410e6..0000000 --- a/lib/s +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 03410e6a7a2b11e47e1fea3b7d9899c7df26435e From 93f1f28c6358754344f31622b70a7bf7d037d6c4 Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Thu, 27 Dec 2018 13:10:47 +0100 Subject: [PATCH 2/5] Assimilate forge v0.1.0-27-gfd33db0 --- .gitmodules | 3 +++ init.el | 3 +++ lib/forge | 1 + 3 files changed, 7 insertions(+) create mode 160000 lib/forge diff --git a/.gitmodules b/.gitmodules index 0975323..cd67d02 100644 --- a/.gitmodules +++ b/.gitmodules @@ -24,6 +24,9 @@ [submodule "epkg"] path = lib/epkg url = git@github.com:emacscollective/epkg.git +[submodule "forge"] + path = lib/forge + url = git@github.com:magit/forge.git [submodule "ghub"] path = lib/ghub url = git@github.com:magit/ghub.git diff --git a/init.el b/init.el index 1ed2e86..af82e48 100644 --- a/init.el +++ b/init.el @@ -88,6 +88,9 @@ :when (version< "25" emacs-version) :config (global-eldoc-mode)) +(use-package forge + :after magit) + (use-package git-commit :defer t :config diff --git a/lib/forge b/lib/forge new file mode 160000 index 0000000..fd33db0 --- /dev/null +++ b/lib/forge @@ -0,0 +1 @@ +Subproject commit fd33db0bc72c45af4321e8aca7c3e10174a676dd From 153bf5188c1bdb343250631d16b88891e9f10730 Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Thu, 27 Dec 2018 13:16:15 +0100 Subject: [PATCH 3/5] Emacsg: Add .dir-locals.el Use `git-commit-elisp-text-mode' as `git-commit-major-mode'. --- .dir-locals.el | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .dir-locals.el diff --git a/.dir-locals.el b/.dir-locals.el new file mode 100644 index 0000000..7039f29 --- /dev/null +++ b/.dir-locals.el @@ -0,0 +1,2 @@ +((git-commit-mode + (git-commit-major-mode . git-commit-elisp-text-mode))) From 7b2c815e5d8334fbeb4cd4229e6e485966e31be5 Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Thu, 27 Dec 2018 13:26:04 +0100 Subject: [PATCH 4/5] magit: Update wip mode configuration --- init.el | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/init.el b/init.el index af82e48..df05263 100644 --- a/init.el +++ b/init.el @@ -200,10 +200,7 @@ (use-package magit-wip :after magit - :config - (magit-wip-before-change-mode) - (magit-wip-after-apply-mode) - (magit-wip-after-save-mode)) + :config (magit-wip-mode)) (use-package man :defer t From e902cc6b06883ecb074a9ecf5a7006bcf89966d2 Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Thu, 27 Dec 2018 13:30:19 +0100 Subject: [PATCH 5/5] diff-hl: Enable diff-hl-flydiff-mode --- init.el | 3 +++ 1 file changed, 3 insertions(+) diff --git a/init.el b/init.el index df05263..719eaef 100644 --- a/init.el +++ b/init.el @@ -76,6 +76,9 @@ (global-diff-hl-mode) (add-hook 'magit-post-refresh-hook 'diff-hl-magit-post-refresh t)) +(use-package diff-hl-flydiff + :config (diff-hl-flydiff-mode)) + (use-package dired :defer t :config (setq dired-listing-switches "-alh"))