Merge branch 'master' into layer/all

.gitmodules

@@ -9,7 +9,7 @@
 	url = git@github.com:emacscollective/borg.git
 [submodule "closql"]
 	path = lib/closql
-	url = git@github.com:emacscollective/closql.git
+	url = git@github.com:magit/closql.git
 [submodule "compat"]
 	path = lib/compat
 	url = https://git.sr.ht/~pkal/compat
@@ -33,10 +33,7 @@
 [submodule "emacsql"]
 	no-byte-compile = emacsql-pg.el
 	path = lib/emacsql
-	url = git@github.com:skeeto/emacsql.git
+	url = git@github.com:magit/emacsql.git
-[submodule "emacsql-sqlite-builtin"]
-	path = lib/emacsql-sqlite-builtin
-	url = git@github.com:emacscollective/emacsql-sqlite-builtin.git
 [submodule "epkg"]
 	path = lib/epkg
 	url = git@github.com:emacscollective/epkg.git

Makefile

@@ -1,17 +1,28 @@
 -include lib/borg/borg.mk
 
+ifndef BORG_DIR
+
+help helpall::
+	$(info )
+	$(info Bootstrapping)
+	$(info -------------)
+	$(info make bootstrap-borg  = make borg and make targets available)
+	@printf "\n"
+
 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
 
+else
+
 helpall::
 	$(info Test and fix targets)
 	$(info --------------------)
 	$(info make codespell-dry   = run codespell, dry run)
 	$(info make codespell-fix   = run codespell, write fixes)
-	$(info )
+	@printf "\n"
 
 codespell-dry:
 	@cd lib; codespell \
@@ -26,3 +37,5 @@ codespell-fix:
 	  --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" ",")
+
+endif

init.el

@@ -82,7 +82,7 @@
   (add-hook 'before-save-hook 'copyright-update))
 
 (use-package dash
-  :config (global-dash-fontify-mode 1))
+  :config (global-dash-fontify-mode))
 
 (use-package diff-hl
   :config
@@ -247,7 +247,7 @@
 
 (use-package recentf
   :demand t
-  :config (add-to-list 'recentf-exclude "^/\\(?:ssh\\|su\\|sudo\\)?:"))
+  :config (add-to-list 'recentf-exclude "^/\\(?:ssh\\|su\\|sudo\\)?x?:"))
 
 (use-package savehist
   :config (savehist-mode))