mirror of
https://github.com/emacscollective/emacs.g.git
synced 2025-06-07 08:14:16 -04:00
Merge branch 'master' into drone/bash-completion
This commit is contained in:
commit
0f81d19fce
18
Makefile
18
Makefile
@ -1,7 +1,25 @@
|
|||||||
-include lib/borg/borg.mk
|
-include lib/borg/borg.mk
|
||||||
|
|
||||||
|
help::
|
||||||
|
$(info make codespell-dry = run codespell, dry run)
|
||||||
|
$(info make codespell-fix = run codespell, write fixes)
|
||||||
|
|
||||||
bootstrap-borg:
|
bootstrap-borg:
|
||||||
@git submodule--helper clone --name borg --path lib/borg \
|
@git submodule--helper clone --name borg --path lib/borg \
|
||||||
--url git@github.com:emacscollective/borg.git
|
--url git@github.com:emacscollective/borg.git
|
||||||
@cd lib/borg; git symbolic-ref HEAD refs/heads/master
|
@cd lib/borg; git symbolic-ref HEAD refs/heads/master
|
||||||
@cd lib/borg; git reset --hard HEAD
|
@cd lib/borg; git reset --hard HEAD
|
||||||
|
|
||||||
|
codespell-dry:
|
||||||
|
@cd lib; codespell \
|
||||||
|
--ignore-words ~/.emacs.d/etc/codespell/ignore-words \
|
||||||
|
--exclude-file ~/.emacs.d/etc/codespell/ignore-lines \
|
||||||
|
--skip $(shell sed '/^\s*$$/d;/^\s*#.*$$/d;s/#.*//;s/\s//g' \
|
||||||
|
~/.emacs.d/etc/codespell/ignore-files | tr "\\n" ",")
|
||||||
|
|
||||||
|
codespell-fix:
|
||||||
|
@cd lib; codespell --write-changes \
|
||||||
|
--ignore-words ~/.emacs.d/etc/codespell/ignore-words \
|
||||||
|
--exclude-file ~/.emacs.d/etc/codespell/ignore-lines \
|
||||||
|
--skip $(shell sed '/^\s*$$/d;/^\s*#.*$$/d;s/#.*//;s/\s//g' \
|
||||||
|
~/.emacs.d/etc/codespell/ignore-files | tr "\\n" ",")
|
||||||
|
@ -1,5 +1,14 @@
|
|||||||
;;; early-init.el --- earliest birds -*- lexical-binding: t -*-
|
;;; early-init.el --- earliest birds -*- lexical-binding: t -*-
|
||||||
|
|
||||||
|
(setq load-prefer-newer t)
|
||||||
|
|
||||||
|
(let ((dir (file-name-directory (or load-file-name buffer-file-name))))
|
||||||
|
(add-to-list 'load-path (expand-file-name "lib/packed" dir))
|
||||||
|
(add-to-list 'load-path (expand-file-name "lib/auto-compile" dir)))
|
||||||
|
(require 'auto-compile)
|
||||||
|
(auto-compile-on-load-mode)
|
||||||
|
(auto-compile-on-save-mode)
|
||||||
|
|
||||||
(setq package-enable-at-startup nil)
|
(setq package-enable-at-startup nil)
|
||||||
|
|
||||||
(with-eval-after-load 'package
|
(with-eval-after-load 'package
|
||||||
|
23
etc/codespell/ignore-files
Normal file
23
etc/codespell/ignore-files
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
*.a
|
||||||
|
*.bin
|
||||||
|
*.elc
|
||||||
|
*.epub
|
||||||
|
*.gif
|
||||||
|
*.gz
|
||||||
|
*.ico
|
||||||
|
*.jar
|
||||||
|
*.jpg
|
||||||
|
*.o
|
||||||
|
*.out
|
||||||
|
*.pdf
|
||||||
|
*.png
|
||||||
|
*.so
|
||||||
|
*.so*
|
||||||
|
|
||||||
|
.cask
|
||||||
|
ert.el
|
||||||
|
|
||||||
|
./emacsql/sqlite
|
||||||
|
./libgit/libgit2
|
||||||
|
./magit/Documentation/AUTHORS.md
|
||||||
|
./magit/Documentation/BACKERS.md
|
11
etc/codespell/ignore-lines
Normal file
11
etc/codespell/ignore-lines
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
# emacsql
|
||||||
|
INOUT INSENSITIVE INSERT INT INT1 INT2 INT3 INT4 INT8 INTEGER
|
||||||
|
# magit
|
||||||
|
(let ((fro (or magit-git-output-coding-system
|
||||||
|
(cons (coding-system-change-eol-conversion fro 'unix)
|
||||||
|
(cons fro to))))
|
||||||
|
(?c "[c]ommit" 'magit-ediff-show-commit)
|
||||||
|
(?s "[s]tage" 'magit-ediff-stage)
|
||||||
|
1 Li-Yun Chang
|
||||||
|
# treepy
|
||||||
|
(and (mapp node)
|
12
etc/codespell/ignore-words
Normal file
12
etc/codespell/ignore-words
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
# technical terms
|
||||||
|
commitish
|
||||||
|
dependant
|
||||||
|
|
||||||
|
# software and abbreviations
|
||||||
|
clos
|
||||||
|
|
||||||
|
# symbols
|
||||||
|
hist
|
||||||
|
nd
|
||||||
|
pullrequest
|
||||||
|
pullrequests
|
5
init.el
5
init.el
@ -18,7 +18,6 @@
|
|||||||
(setq inhibit-startup-echo-area-message "locutus")
|
(setq inhibit-startup-echo-area-message "locutus")
|
||||||
(setq initial-buffer-choice t)
|
(setq initial-buffer-choice t)
|
||||||
(setq initial-scratch-message "")
|
(setq initial-scratch-message "")
|
||||||
(setq load-prefer-newer t)
|
|
||||||
(scroll-bar-mode 0)
|
(scroll-bar-mode 0)
|
||||||
(tool-bar-mode 0)
|
(tool-bar-mode 0)
|
||||||
(menu-bar-mode 0))
|
(menu-bar-mode 0))
|
||||||
@ -33,10 +32,7 @@
|
|||||||
(setq use-package-verbose t))
|
(setq use-package-verbose t))
|
||||||
|
|
||||||
(use-package auto-compile
|
(use-package auto-compile
|
||||||
:demand t
|
|
||||||
:config
|
:config
|
||||||
(auto-compile-on-load-mode)
|
|
||||||
(auto-compile-on-save-mode)
|
|
||||||
(setq auto-compile-display-buffer nil)
|
(setq auto-compile-display-buffer nil)
|
||||||
(setq auto-compile-mode-line-counter t)
|
(setq auto-compile-mode-line-counter t)
|
||||||
(setq auto-compile-source-recreate-deletes-dest t)
|
(setq auto-compile-source-recreate-deletes-dest t)
|
||||||
@ -146,7 +142,6 @@
|
|||||||
:defer t
|
:defer t
|
||||||
:config
|
:config
|
||||||
(when (>= emacs-major-version 27)
|
(when (>= emacs-major-version 27)
|
||||||
(set-face-attribute 'smerge-refined-changed nil :extend t)
|
|
||||||
(set-face-attribute 'smerge-refined-removed nil :extend t)
|
(set-face-attribute 'smerge-refined-removed nil :extend t)
|
||||||
(set-face-attribute 'smerge-refined-added nil :extend t)))
|
(set-face-attribute 'smerge-refined-added nil :extend t)))
|
||||||
|
|
||||||
|
2
lib/borg
2
lib/borg
@ -1 +1 @@
|
|||||||
Subproject commit 3cfb35f5c54a76f200272ed11b4a39f11a57552c
|
Subproject commit f6a2e0cb8c3db5840c717114caba93793f2e9661
|
@ -1 +1 @@
|
|||||||
Subproject commit 1e78f96dc976badb59067c986f7766cce89405cc
|
Subproject commit e1e5609c1a1c6ca5f93b2265bd29bba597c52f9b
|
2
lib/dash
2
lib/dash
@ -1 +1 @@
|
|||||||
Subproject commit 721436b04da4e2795387cb48a98ac6de37ece0fd
|
Subproject commit fe9bbc2414af645d255de68cd59cf0edd5d8548b
|
@ -1 +1 @@
|
|||||||
Subproject commit 2cf8b489f3b71c869a5626a5eb41f36495bdfd61
|
Subproject commit ab2f4f0db9b0c3484db837252ce2dc75f4696b1d
|
2
lib/epkg
2
lib/epkg
@ -1 +1 @@
|
|||||||
Subproject commit edf8c009066360af61caedf67a2482eaa19481b0
|
Subproject commit a79bd5b888415b960a45005d44e980c1aa1ceb91
|
2
lib/ghub
2
lib/ghub
@ -1 +1 @@
|
|||||||
Subproject commit a8bf337534ec583906db77a3d56f7d1b84bda952
|
Subproject commit 206f2b5b2ab622efda8da85feaa3bc2a1e0f3da3
|
@ -1 +1 @@
|
|||||||
Subproject commit 6c3b89276a149b2d009882f756a9edf866671f05
|
Subproject commit 0ef8b13aef011a98b7da756e4f1ce3bb18e4d55a
|
@ -1 +1 @@
|
|||||||
Subproject commit 68b5a13fa1b6b122d4a2547b8c415aadff83d8ca
|
Subproject commit afe8bee55c56d81c897109c9a87c0e218ed39710
|
@ -1 +1 @@
|
|||||||
Subproject commit a269614c69ad8b2703e6e5093d0017d6afad6cca
|
Subproject commit a6e4cced303b3febd59412b24a97eaf1e855e6d7
|
@ -1 +1 @@
|
|||||||
Subproject commit 42db6b3d90ee57d0f5947d3b0bf4b0010bdf7b40
|
Subproject commit d2640fec376a8458a669e7526e63e5870d875118
|
@ -1 +1 @@
|
|||||||
Subproject commit 4fe66d4d55c8eacebda53a13cc38e01d32bdaaa2
|
Subproject commit 7ec873bd569ce9cbec15722674f4057a35075d95
|
Loading…
x
Reference in New Issue
Block a user