mirror/emacs.g
1
0
Fork 0
mirror of https://github.com/emacscollective/emacs.g.git synced 2025-11-23 11:41:18 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into layer/elisp

Browse Source
This commit is contained in:
Jonas Bernoulli
2017-11-27 12:53:15 +01:00
parent 1ee595da10 76a26068ba
commit 0b50919c3e
12 changed files with 21 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@@ -34,6 +34,9 @@
path = lib/magit path = lib/magit
url = git@github.com:magit/magit.git url = git@github.com:magit/magit.git
info-path = Documentation info-path = Documentation
[submodule "magit-popup"]
path = lib/magit-popup
url = git@github.com:magit/magit-popup.git
[submodule "package-build"] [submodule "package-build"]
path = lib/package-build path = lib/package-build
url = git@github.com:melpa/package-build.git url = git@github.com:melpa/package-build.git

10
Makefile
View File

@@ -3,6 +3,8 @@
# Author: Jonas Bernoulli <jonas@bernoul.li> # Author: Jonas Bernoulli <jonas@bernoul.li>
# License: GPL v3 <https://www.gnu.org/licenses/gpl-3.0.txt> # License: GPL v3 <https://www.gnu.org/licenses/gpl-3.0.txt>
EMACS ?= emacs
.PHONY: all help build build-init quick bootstrap .PHONY: all help build build-init quick bootstrap
.FORCE: .FORCE:
@@ -19,24 +21,24 @@ help:
build: build:
@rm -f init.elc @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-initialize \
--funcall borg-batch-rebuild 2>&1 --funcall borg-batch-rebuild 2>&1
build-init: build-init:
@rm -f init.elc @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-initialize \
--funcall borg-batch-rebuild-init 2>&1 --funcall borg-batch-rebuild-init 2>&1
quick: quick:
@rm -f init.elc @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-initialize \
--eval '(borg-batch-rebuild t)' 2>&1 --eval '(borg-batch-rebuild t)' 2>&1
lib/%: .FORCE lib/%: .FORCE
@emacs -Q --batch -L lib/borg --load borg \ @$(EMACS) -Q --batch -L lib/borg --load borg \
--funcall borg-initialize \ --funcall borg-initialize \
--eval '(borg-build "$(@F)")' 2>&1 --eval '(borg-build "$(@F)")' 2>&1

17
init.el
View File

@@ -104,20 +104,9 @@
("C-x M-g" . magit-dispatch-popup)) ("C-x M-g" . magit-dispatch-popup))
:config :config
(magit-add-section-hook 'magit-status-sections-hook (magit-add-section-hook 'magit-status-sections-hook
'magit-insert-modules-unpulled-from-upstream 'magit-insert-modules
'magit-insert-unpulled-from-upstream) 'magit-insert-stashes
(magit-add-section-hook 'magit-status-sections-hook 'append))
'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))
(use-package man (use-package man
:defer t :defer t

2
lib/borg

Submodule lib/borg updated: 34eac585d6...ba62a78d2b

2
lib/closql

Submodule lib/closql updated: 6659783124...49862bfdd1

2
lib/dash

Submodule lib/dash updated: dcb0ec1623...91d8cb01e6

2
lib/epkg

Submodule lib/epkg updated: 1768e91e02...6114b78b84

2
lib/finalize

Submodule lib/finalize updated: 0f7d47c4d5...0496a7b8f2

2
lib/magit

Submodule lib/magit updated: 4ad2ebfef0...aa0f186467

1
lib/magit-popup Submodule

Submodule lib/magit-popup added at 70e3cdd614

2
lib/use-package

Submodule lib/use-package updated: 360df30683...98f9e120aa

2
lib/with-editor

Submodule lib/with-editor updated: 241726118d...ee39f232f2