From 2548b8c2d131afcdd28004a315ee65128cee6d04 Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Fri, 22 May 2020 15:07:03 +0200 Subject: [PATCH 1/4] Update 11 drones Update borg to v3.1.2-13-gf6a2e0c Update closql to v1.0.2 Update dash to 2.17.0-2-gfe9bbc2 Update diff-hl to 1.8.7-13-gab2f4f0 Update epkg to v3.2.2-12-ga79bd5b Update ghub to v3.3.0-7-g206f2b5 Update libgit to 0ef8b13 Update magit to v2.90.1-979-gafe8bee55 Update transient to v0.2.0-11-ga6e4cced Update use-package to 2.4-32-gd2640fe Update with-editor to v2.9.2 --- lib/borg | 2 +- lib/closql | 2 +- lib/dash | 2 +- lib/diff-hl | 2 +- lib/epkg | 2 +- lib/ghub | 2 +- lib/libgit | 2 +- lib/magit | 2 +- lib/transient | 2 +- lib/use-package | 2 +- lib/with-editor | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/lib/borg b/lib/borg index 3cfb35f..f6a2e0c 160000 --- a/lib/borg +++ b/lib/borg @@ -1 +1 @@ -Subproject commit 3cfb35f5c54a76f200272ed11b4a39f11a57552c +Subproject commit f6a2e0cb8c3db5840c717114caba93793f2e9661 diff --git a/lib/closql b/lib/closql index 1e78f96..e1e5609 160000 --- a/lib/closql +++ b/lib/closql @@ -1 +1 @@ -Subproject commit 1e78f96dc976badb59067c986f7766cce89405cc +Subproject commit e1e5609c1a1c6ca5f93b2265bd29bba597c52f9b diff --git a/lib/dash b/lib/dash index 721436b..fe9bbc2 160000 --- a/lib/dash +++ b/lib/dash @@ -1 +1 @@ -Subproject commit 721436b04da4e2795387cb48a98ac6de37ece0fd +Subproject commit fe9bbc2414af645d255de68cd59cf0edd5d8548b diff --git a/lib/diff-hl b/lib/diff-hl index 2cf8b48..ab2f4f0 160000 --- a/lib/diff-hl +++ b/lib/diff-hl @@ -1 +1 @@ -Subproject commit 2cf8b489f3b71c869a5626a5eb41f36495bdfd61 +Subproject commit ab2f4f0db9b0c3484db837252ce2dc75f4696b1d diff --git a/lib/epkg b/lib/epkg index edf8c00..a79bd5b 160000 --- a/lib/epkg +++ b/lib/epkg @@ -1 +1 @@ -Subproject commit edf8c009066360af61caedf67a2482eaa19481b0 +Subproject commit a79bd5b888415b960a45005d44e980c1aa1ceb91 diff --git a/lib/ghub b/lib/ghub index a8bf337..206f2b5 160000 --- a/lib/ghub +++ b/lib/ghub @@ -1 +1 @@ -Subproject commit a8bf337534ec583906db77a3d56f7d1b84bda952 +Subproject commit 206f2b5b2ab622efda8da85feaa3bc2a1e0f3da3 diff --git a/lib/libgit b/lib/libgit index 6c3b892..0ef8b13 160000 --- a/lib/libgit +++ b/lib/libgit @@ -1 +1 @@ -Subproject commit 6c3b89276a149b2d009882f756a9edf866671f05 +Subproject commit 0ef8b13aef011a98b7da756e4f1ce3bb18e4d55a diff --git a/lib/magit b/lib/magit index 68b5a13..afe8bee 160000 --- a/lib/magit +++ b/lib/magit @@ -1 +1 @@ -Subproject commit 68b5a13fa1b6b122d4a2547b8c415aadff83d8ca +Subproject commit afe8bee55c56d81c897109c9a87c0e218ed39710 diff --git a/lib/transient b/lib/transient index a269614..a6e4cce 160000 --- a/lib/transient +++ b/lib/transient @@ -1 +1 @@ -Subproject commit a269614c69ad8b2703e6e5093d0017d6afad6cca +Subproject commit a6e4cced303b3febd59412b24a97eaf1e855e6d7 diff --git a/lib/use-package b/lib/use-package index 42db6b3..d2640fe 160000 --- a/lib/use-package +++ b/lib/use-package @@ -1 +1 @@ -Subproject commit 42db6b3d90ee57d0f5947d3b0bf4b0010bdf7b40 +Subproject commit d2640fec376a8458a669e7526e63e5870d875118 diff --git a/lib/with-editor b/lib/with-editor index 4fe66d4..7ec873b 160000 --- a/lib/with-editor +++ b/lib/with-editor @@ -1 +1 @@ -Subproject commit 4fe66d4d55c8eacebda53a13cc38e01d32bdaaa2 +Subproject commit 7ec873bd569ce9cbec15722674f4057a35075d95 From 5e2e40574b8e09728bef422e6bae0e4ca24fa0b8 Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Fri, 22 May 2020 15:10:48 +0200 Subject: [PATCH 2/4] smerge-mode: Do not extend smerge-redefine-changed By default this face is not neither used nor has a visible effect. It is used if it does `face-differs-from-default-p', in which case it replaces `smerge-refined-removed' and `smerge-refined-added'. Setting `:extend' makes the `face-differs-from-default-p', but it does not make it *look* different from `default', so doing that effectively hides the refinements. --- init.el | 1 - 1 file changed, 1 deletion(-) diff --git a/init.el b/init.el index 8ec83f6..82344ac 100644 --- a/init.el +++ b/init.el @@ -146,7 +146,6 @@ :defer t :config (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-added nil :extend t))) From a1c54210d1a59315842fd4655a5224d89479681f Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Fri, 22 May 2020 15:17:47 +0200 Subject: [PATCH 3/4] Emacsg: init: Setup auto-compile in early-init.el That way "init.el" can also benefit from `auto-compile-on-load-mode' and `load-prefer-newer'. "early-init.el" still cannot of course, but we already don't compile that file (for this very reason). --- early-init.el | 9 +++++++++ init.el | 4 ---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/early-init.el b/early-init.el index 06edd7c..14f24aa 100644 --- a/early-init.el +++ b/early-init.el @@ -1,5 +1,14 @@ ;;; 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) (with-eval-after-load 'package diff --git a/init.el b/init.el index 82344ac..0462ae6 100644 --- a/init.el +++ b/init.el @@ -18,7 +18,6 @@ (setq inhibit-startup-echo-area-message "locutus") (setq initial-buffer-choice t) (setq initial-scratch-message "") - (setq load-prefer-newer t) (scroll-bar-mode 0) (tool-bar-mode 0) (menu-bar-mode 0)) @@ -33,10 +32,7 @@ (setq use-package-verbose t)) (use-package auto-compile - :demand t :config - (auto-compile-on-load-mode) - (auto-compile-on-save-mode) (setq auto-compile-display-buffer nil) (setq auto-compile-mode-line-counter t) (setq auto-compile-source-recreate-deletes-dest t) From 88849d5c046a65d9f1f33ec0b5d24b9d35604881 Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Fri, 22 May 2020 15:20:42 +0200 Subject: [PATCH 4/4] Emacsg: Spell check drones using codespell executable --- Makefile | 18 ++++++++++++++++++ etc/codespell/ignore-files | 23 +++++++++++++++++++++++ etc/codespell/ignore-lines | 11 +++++++++++ etc/codespell/ignore-words | 12 ++++++++++++ 4 files changed, 64 insertions(+) create mode 100644 etc/codespell/ignore-files create mode 100644 etc/codespell/ignore-lines create mode 100644 etc/codespell/ignore-words diff --git a/Makefile b/Makefile index 974ffd8..a4c25ce 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,25 @@ -include lib/borg/borg.mk +help:: + $(info make codespell-dry = run codespell, dry run) + $(info make codespell-fix = run codespell, write fixes) + bootstrap-borg: @git submodule--helper clone --name borg --path lib/borg \ --url git@github.com:emacscollective/borg.git @cd lib/borg; git symbolic-ref HEAD refs/heads/master @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" ",") diff --git a/etc/codespell/ignore-files b/etc/codespell/ignore-files new file mode 100644 index 0000000..205af93 --- /dev/null +++ b/etc/codespell/ignore-files @@ -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 diff --git a/etc/codespell/ignore-lines b/etc/codespell/ignore-lines new file mode 100644 index 0000000..9d7aead --- /dev/null +++ b/etc/codespell/ignore-lines @@ -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) diff --git a/etc/codespell/ignore-words b/etc/codespell/ignore-words new file mode 100644 index 0000000..f2636ae --- /dev/null +++ b/etc/codespell/ignore-words @@ -0,0 +1,12 @@ +# technical terms +commitish +dependant + +# software and abbreviations +clos + +# symbols +hist +nd +pullrequest +pullrequests