mirror of
https://github.com/emacscollective/emacs.g.git
synced 2025-11-23 11:41:18 -05:00
Merge branch 'master' into drone/bash-completion
This commit is contained in:
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
Submodule lib/borg updated: 3cfb35f5c5...f6a2e0cb8c
Submodule lib/closql updated: 1e78f96dc9...e1e5609c1a
2
lib/dash
2
lib/dash
Submodule lib/dash updated: 721436b04d...fe9bbc2414
Submodule lib/diff-hl updated: 2cf8b489f3...ab2f4f0db9
2
lib/epkg
2
lib/epkg
Submodule lib/epkg updated: edf8c00906...a79bd5b888
2
lib/ghub
2
lib/ghub
Submodule lib/ghub updated: a8bf337534...206f2b5b2a
Submodule lib/libgit updated: 6c3b89276a...0ef8b13aef
Submodule lib/magit updated: 68b5a13fa1...afe8bee55c
Submodule lib/transient updated: a269614c69...a6e4cced30
Submodule lib/use-package updated: 42db6b3d90...d2640fec37
Submodule lib/with-editor updated: 4fe66d4d55...7ec873bd56
Reference in New Issue
Block a user