From 9756b42aa52b7c610318efc87fe274c990753d74 Mon Sep 17 00:00:00 2001 From: Richard Kim Date: Sun, 24 Sep 2017 10:15:09 -0700 Subject: [PATCH 1/4] Emacsg: Makefile: respect EMACS environment variable --- Makefile | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 64395e1..be44cf3 100644 --- a/Makefile +++ b/Makefile @@ -3,6 +3,8 @@ # Author: Jonas Bernoulli # License: GPL v3 +EMACS ?= emacs + .PHONY: all help build build-init quick bootstrap .FORCE: @@ -19,24 +21,24 @@ help: build: @rm -f init.elc - @emacs -Q --batch -L lib/borg --load borg \ + @$(EMACS) -Q --batch -L lib/borg --load borg \ --funcall borg-initialize \ --funcall borg-batch-rebuild 2>&1 build-init: @rm -f init.elc - @emacs -Q --batch -L lib/borg --load borg \ + @$(EMACS) -Q --batch -L lib/borg --load borg \ --funcall borg-initialize \ --funcall borg-batch-rebuild-init 2>&1 quick: @rm -f init.elc - @emacs -Q --batch -L lib/borg --load borg \ + @$(EMACS) -Q --batch -L lib/borg --load borg \ --funcall borg-initialize \ --eval '(borg-batch-rebuild t)' 2>&1 lib/%: .FORCE - @emacs -Q --batch -L lib/borg --load borg \ + @$(EMACS) -Q --batch -L lib/borg --load borg \ --funcall borg-initialize \ --eval '(borg-build "$(@F)")' 2>&1 From f3778d700f109e4bc67a3f7088b9d41cc8f4b2db Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Mon, 27 Nov 2017 11:56:33 +0100 Subject: [PATCH 2/4] Assimilate magit-popup v2.12.0-2-g70e3cdd Update magit to 2.11.0-286-gaa0f18646 magit-popup is no longer part of the magit repository. --- .gitmodules | 3 +++ lib/magit | 2 +- lib/magit-popup | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) create mode 160000 lib/magit-popup diff --git a/.gitmodules b/.gitmodules index 40f4d77..69e95e4 100644 --- a/.gitmodules +++ b/.gitmodules @@ -34,6 +34,9 @@ path = lib/magit url = git@github.com:magit/magit.git info-path = Documentation +[submodule "magit-popup"] + path = lib/magit-popup + url = git@github.com:magit/magit-popup.git [submodule "packed"] path = lib/packed url = git@github.com:emacscollective/packed.git diff --git a/lib/magit b/lib/magit index 4ad2ebf..aa0f186 160000 --- a/lib/magit +++ b/lib/magit @@ -1 +1 @@ -Subproject commit 4ad2ebfef0afa7e5f5fb85e8d1146da613804fe5 +Subproject commit aa0f186467711534ec538e5bf9ea5fdbad0cfc1f diff --git a/lib/magit-popup b/lib/magit-popup new file mode 160000 index 0000000..70e3cdd --- /dev/null +++ b/lib/magit-popup @@ -0,0 +1 @@ +Subproject commit 70e3cdd6140ebdf477f86b88ac2bd1a8de115e88 From 8cf374b249684cc6fac81eb4b7e44e981f3b996c Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Mon, 27 Nov 2017 12:29:56 +0100 Subject: [PATCH 3/4] magit: add new magit-insert-modules to magit-status-sections-hook Instead of adding various `magit-insert-modules-*' functions directly. --- init.el | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/init.el b/init.el index 16ffe3c..b41a8c4 100644 --- a/init.el +++ b/init.el @@ -100,20 +100,9 @@ ("C-x M-g" . magit-dispatch-popup)) :config (magit-add-section-hook 'magit-status-sections-hook - 'magit-insert-modules-unpulled-from-upstream - 'magit-insert-unpulled-from-upstream) - (magit-add-section-hook 'magit-status-sections-hook - 'magit-insert-modules-unpulled-from-pushremote - 'magit-insert-unpulled-from-upstream) - (magit-add-section-hook 'magit-status-sections-hook - 'magit-insert-modules-unpushed-to-upstream - 'magit-insert-unpulled-from-upstream) - (magit-add-section-hook 'magit-status-sections-hook - 'magit-insert-modules-unpushed-to-pushremote - 'magit-insert-unpulled-from-upstream) - (magit-add-section-hook 'magit-status-sections-hook - 'magit-insert-submodules - 'magit-insert-unpulled-from-upstream)) + 'magit-insert-modules + 'magit-insert-stashes + 'append)) (use-package man :defer t From 76a26068ba3bf1d170f90951a6c815e02003ebb3 Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Mon, 27 Nov 2017 12:31:34 +0100 Subject: [PATCH 4/4] Update 7 drones Update borg to v2.0.0-8-gba62a78 Update closql to v0.5.0 Update dash to 2.13.0-57-g91d8cb0 Update epkg to v3.0.0-8-g6114b78 Update finalize to 2.0.0-1-g0496a7b Update use-package to 2.3-94-g98f9e12 Update with-editor to v2.7.0-7-gee39f23 --- lib/borg | 2 +- lib/closql | 2 +- lib/dash | 2 +- lib/epkg | 2 +- lib/finalize | 2 +- lib/use-package | 2 +- lib/with-editor | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/borg b/lib/borg index 34eac58..ba62a78 160000 --- a/lib/borg +++ b/lib/borg @@ -1 +1 @@ -Subproject commit 34eac585d6829e17ce59b09fe6ad5d675302c096 +Subproject commit ba62a78d2b3f9f96306c5aa07492106073201936 diff --git a/lib/closql b/lib/closql index 6659783..49862bf 160000 --- a/lib/closql +++ b/lib/closql @@ -1 +1 @@ -Subproject commit 66597831248bbe14ebc7bbf24b24cafebb5fd362 +Subproject commit 49862bfdd1540d443d278fadef16a83388b360cb diff --git a/lib/dash b/lib/dash index dcb0ec1..91d8cb0 160000 --- a/lib/dash +++ b/lib/dash @@ -1 +1 @@ -Subproject commit dcb0ec1623517e54551b801846a272dd07fd55b2 +Subproject commit 91d8cb01e62bab0d6267d3d4dbcabd6da6fdea78 diff --git a/lib/epkg b/lib/epkg index 1768e91..6114b78 160000 --- a/lib/epkg +++ b/lib/epkg @@ -1 +1 @@ -Subproject commit 1768e91e02a2d6441c2d82a711912a9498d2316e +Subproject commit 6114b78b84cd8a96a117b7652d1e5138eee4b896 diff --git a/lib/finalize b/lib/finalize index 0f7d47c..0496a7b 160000 --- a/lib/finalize +++ b/lib/finalize @@ -1 +1 @@ -Subproject commit 0f7d47c4d50f1c76fc3b43bfc2d4886dd3e8ca27 +Subproject commit 0496a7b8f2f8b197010d8602b5fc529f5104704a diff --git a/lib/use-package b/lib/use-package index 360df30..98f9e12 160000 --- a/lib/use-package +++ b/lib/use-package @@ -1 +1 @@ -Subproject commit 360df30683a711c443f87e495ba14cdd125a505d +Subproject commit 98f9e120aaac902f611807002ed58215b2620bfd diff --git a/lib/with-editor b/lib/with-editor index 2417261..ee39f23 160000 --- a/lib/with-editor +++ b/lib/with-editor @@ -1 +1 @@ -Subproject commit 241726118dee067a8d9880d53c6a781d580ba8a1 +Subproject commit ee39f232f2daf997498a4030d104c35ae397f457