Merge branch 'master' into layer/cosmetics

This commit is contained in:
Jonas Bernoulli
2017-12-21 03:25:37 +01:00
14 changed files with 35 additions and 17 deletions

1
.gitignore vendored
View File

@@ -1,4 +1,5 @@
/.cask
/.hive-maint
/custom.el
/elpa
/var

3
.gitmodules vendored
View File

@@ -30,9 +30,6 @@
[submodule "fill-column-indicator"]
path = lib/fill-column-indicator
url = git@github.com:alpaker/Fill-Column-Indicator.git
[submodule "finalize"]
path = lib/finalize
url = git@github.com:skeeto/elisp-finalize.git
[submodule "git-modes"]
path = lib/git-modes
url = git@github.com:magit/git-modes.git

View File

@@ -5,11 +5,20 @@
EMACS ?= emacs
.PHONY: all help build build-init quick bootstrap
.PHONY: all help build build-init quick bootstrap clean
.FORCE:
all: build
SILENCIO = --load subr-x
SILENCIO += --eval "(put 'if-let 'byte-obsolete-info nil)"
SILENCIO += --eval "(put 'when-let 'byte-obsolete-info nil)"
SILENCIO += --eval "(fset 'original-message (symbol-function 'message))"
SILENCIO += --eval "(fset 'message\
(lambda (format &rest args)\
(unless (equal format \"pcase-memoize: equal first branch, yet different\")\
(apply 'original-message format args))))"
help:
$(info )
$(info make [all|build] = rebuild all drones and init files)
@@ -17,11 +26,12 @@ help:
$(info make lib/DRONE = rebuild DRONE)
$(info make build-init = rebuild init files)
$(info make bootstrap = bootstrap collective or new drones)
$(info make clean = remove all *.elc and *-autoloads.el)
@printf "\n"
build:
@rm -f init.elc
@$(EMACS) -Q --batch -L lib/borg --load borg \
@$(EMACS) -Q --batch -L lib/borg --load borg $(SILENCIO) \
--funcall borg-initialize \
--funcall borg-batch-rebuild 2>&1
@@ -33,12 +43,12 @@ build-init:
quick:
@rm -f init.elc
@$(EMACS) -Q --batch -L lib/borg --load borg \
@$(EMACS) -Q --batch -L lib/borg --load borg $(SILENCIO) \
--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 $(SILENCIO) \
--funcall borg-initialize \
--eval '(borg-build "$(@F)")' 2>&1
@@ -49,3 +59,8 @@ bootstrap:
@bin/borg-bootstrap
@printf "\n=== Running 'make build' ===\n\n"
@make build
clean:
@find lib -name '*-autoloads.el' -exec rm '{}' ';'
@find lib -name '*.elc' -exec rm '{}' ';'
@rm -f init.elc

View File

@@ -10,6 +10,7 @@
(setq user-emacs-directory (file-name-directory user-init-file))
(message "Loading %s..." user-init-file)
(setq package-enable-at-startup nil)
;; (package-initialize)
(setq inhibit-startup-buffer-menu t)
(setq inhibit-startup-screen t)
(setq inhibit-startup-echo-area-message "locutus")
@@ -29,6 +30,11 @@
(require 'use-package)
(setq use-package-verbose t))
(use-package subr-x
:config
(put 'if-let 'byte-obsolete-info nil)
(put 'when-let 'byte-obsolete-info nil))
(use-package auto-compile
:demand t
:config

Submodule lib/finalize deleted from 0496a7b8f2