mirror of
https://github.com/emacscollective/emacs.g.git
synced 2025-11-23 11:41:18 -05:00
Merge branch 'master' into layer/cosmetics
This commit is contained in:
1
.gitignore
vendored
1
.gitignore
vendored
@@ -1,4 +1,5 @@
|
|||||||
/.cask
|
/.cask
|
||||||
/.hive-maint
|
/.hive-maint
|
||||||
/custom.el
|
/custom.el
|
||||||
|
/elpa
|
||||||
/var
|
/var
|
||||||
|
|||||||
3
.gitmodules
vendored
3
.gitmodules
vendored
@@ -30,9 +30,6 @@
|
|||||||
[submodule "fill-column-indicator"]
|
[submodule "fill-column-indicator"]
|
||||||
path = lib/fill-column-indicator
|
path = lib/fill-column-indicator
|
||||||
url = git@github.com:alpaker/Fill-Column-Indicator.git
|
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"]
|
[submodule "git-modes"]
|
||||||
path = lib/git-modes
|
path = lib/git-modes
|
||||||
url = git@github.com:magit/git-modes.git
|
url = git@github.com:magit/git-modes.git
|
||||||
|
|||||||
23
Makefile
23
Makefile
@@ -5,11 +5,20 @@
|
|||||||
|
|
||||||
EMACS ?= emacs
|
EMACS ?= emacs
|
||||||
|
|
||||||
.PHONY: all help build build-init quick bootstrap
|
.PHONY: all help build build-init quick bootstrap clean
|
||||||
.FORCE:
|
.FORCE:
|
||||||
|
|
||||||
all: build
|
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:
|
help:
|
||||||
$(info )
|
$(info )
|
||||||
$(info make [all|build] = rebuild all drones and init files)
|
$(info make [all|build] = rebuild all drones and init files)
|
||||||
@@ -17,11 +26,12 @@ help:
|
|||||||
$(info make lib/DRONE = rebuild DRONE)
|
$(info make lib/DRONE = rebuild DRONE)
|
||||||
$(info make build-init = rebuild init files)
|
$(info make build-init = rebuild init files)
|
||||||
$(info make bootstrap = bootstrap collective or new drones)
|
$(info make bootstrap = bootstrap collective or new drones)
|
||||||
|
$(info make clean = remove all *.elc and *-autoloads.el)
|
||||||
@printf "\n"
|
@printf "\n"
|
||||||
|
|
||||||
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 $(SILENCIO) \
|
||||||
--funcall borg-initialize \
|
--funcall borg-initialize \
|
||||||
--funcall borg-batch-rebuild 2>&1
|
--funcall borg-batch-rebuild 2>&1
|
||||||
|
|
||||||
@@ -33,12 +43,12 @@ build-init:
|
|||||||
|
|
||||||
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 $(SILENCIO) \
|
||||||
--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 $(SILENCIO) \
|
||||||
--funcall borg-initialize \
|
--funcall borg-initialize \
|
||||||
--eval '(borg-build "$(@F)")' 2>&1
|
--eval '(borg-build "$(@F)")' 2>&1
|
||||||
|
|
||||||
@@ -49,3 +59,8 @@ bootstrap:
|
|||||||
@bin/borg-bootstrap
|
@bin/borg-bootstrap
|
||||||
@printf "\n=== Running 'make build' ===\n\n"
|
@printf "\n=== Running 'make build' ===\n\n"
|
||||||
@make build
|
@make build
|
||||||
|
|
||||||
|
clean:
|
||||||
|
@find lib -name '*-autoloads.el' -exec rm '{}' ';'
|
||||||
|
@find lib -name '*.elc' -exec rm '{}' ';'
|
||||||
|
@rm -f init.elc
|
||||||
|
|||||||
6
init.el
6
init.el
@@ -10,6 +10,7 @@
|
|||||||
(setq user-emacs-directory (file-name-directory user-init-file))
|
(setq user-emacs-directory (file-name-directory user-init-file))
|
||||||
(message "Loading %s..." user-init-file)
|
(message "Loading %s..." user-init-file)
|
||||||
(setq package-enable-at-startup nil)
|
(setq package-enable-at-startup nil)
|
||||||
|
;; (package-initialize)
|
||||||
(setq inhibit-startup-buffer-menu t)
|
(setq inhibit-startup-buffer-menu t)
|
||||||
(setq inhibit-startup-screen t)
|
(setq inhibit-startup-screen t)
|
||||||
(setq inhibit-startup-echo-area-message "locutus")
|
(setq inhibit-startup-echo-area-message "locutus")
|
||||||
@@ -29,6 +30,11 @@
|
|||||||
(require 'use-package)
|
(require 'use-package)
|
||||||
(setq use-package-verbose t))
|
(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
|
(use-package auto-compile
|
||||||
:demand t
|
:demand t
|
||||||
:config
|
:config
|
||||||
|
|||||||
Submodule lib/auto-compile updated: a31819a1b7...694b92ea58
2
lib/borg
2
lib/borg
Submodule lib/borg updated: ba62a78d2b...4b908fd5b4
Submodule lib/closql updated: 49862bfdd1...01cb892f6a
Submodule lib/emacsql updated: e3bc9b105f...616dde3752
2
lib/epkg
2
lib/epkg
Submodule lib/epkg updated: 6114b78b84...71ce3ffd41
Submodule lib/finalize deleted from 0496a7b8f2
Submodule lib/magit updated: aa0f186467...0ee62ee80e
Submodule lib/magit-popup updated: 70e3cdd614...3f23e81eb0
Submodule lib/use-package updated: 98f9e120aa...865e931889
Submodule lib/with-editor updated: ee39f232f2...05338d893f
Reference in New Issue
Block a user