mirror/emacs.g
1
0
Fork 0
mirror of https://github.com/emacscollective/emacs.g.git synced 2025-07-05 16:37:39 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into layer/essentials

Browse Source
This commit is contained in:
Jonas Bernoulli 2017-11-27 12:46:46 +01:00
commit faf0b79a20
12 changed files with 21 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@ -37,6 +37,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 "markdown-mode"]
path = lib/markdown-mode
url = git@github.com:jrblevin/markdown-mode.git

10
Makefile
View File

@ -3,6 +3,8 @@
# Author: Jonas Bernoulli <jonas@bernoul.li>
# License: GPL v3 <https://www.gnu.org/licenses/gpl-3.0.txt>
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

17
init.el
View File

@ -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

2
lib/borg

@ -1 +1 @@
Subproject commit 34eac585d6829e17ce59b09fe6ad5d675302c096
Subproject commit ba62a78d2b3f9f96306c5aa07492106073201936

2
lib/closql

@ -1 +1 @@
Subproject commit 66597831248bbe14ebc7bbf24b24cafebb5fd362
Subproject commit 49862bfdd1540d443d278fadef16a83388b360cb

2
lib/dash

@ -1 +1 @@
Subproject commit dcb0ec1623517e54551b801846a272dd07fd55b2
Subproject commit 91d8cb01e62bab0d6267d3d4dbcabd6da6fdea78

2
lib/epkg

@ -1 +1 @@
Subproject commit 1768e91e02a2d6441c2d82a711912a9498d2316e
Subproject commit 6114b78b84cd8a96a117b7652d1e5138eee4b896

2
lib/finalize

@ -1 +1 @@
Subproject commit 0f7d47c4d50f1c76fc3b43bfc2d4886dd3e8ca27
Subproject commit 0496a7b8f2f8b197010d8602b5fc529f5104704a

2
lib/magit

@ -1 +1 @@
Subproject commit 4ad2ebfef0afa7e5f5fb85e8d1146da613804fe5
Subproject commit aa0f186467711534ec538e5bf9ea5fdbad0cfc1f

1
lib/magit-popup Submodule

@ -0,0 +1 @@
Subproject commit 70e3cdd6140ebdf477f86b88ac2bd1a8de115e88

2
lib/use-package

@ -1 +1 @@
Subproject commit 360df30683a711c443f87e495ba14cdd125a505d
Subproject commit 98f9e120aaac902f611807002ed58215b2620bfd

2
lib/with-editor

@ -1 +1 @@
Subproject commit 241726118dee067a8d9880d53c6a781d580ba8a1
Subproject commit ee39f232f2daf997498a4030d104c35ae397f457