Merge branch 'master' into drone/bash-completion

This commit is contained in:
Jonas Bernoulli 2022-06-10 20:32:25 +02:00
commit 19df1fe9ae
No known key found for this signature in database
GPG Key ID: 230C2EFBB326D927
2 changed files with 6 additions and 2 deletions

1
.gitmodules vendored
View File

@ -46,6 +46,7 @@
path = lib/packed path = lib/packed
url = git@github.com:emacscollective/packed.git url = git@github.com:emacscollective/packed.git
[submodule "sqlite3"] [submodule "sqlite3"]
build-step = make
path = lib/sqlite3 path = lib/sqlite3
url = git@github.com:pekingduck/emacs-sqlite3-api.git url = git@github.com:pekingduck/emacs-sqlite3-api.git
[submodule "transient"] [submodule "transient"]

View File

@ -46,8 +46,11 @@
(use-package epkg (use-package epkg
:defer t :defer t
:init (setq epkg-repository :init
(expand-file-name "var/epkgs/" user-emacs-directory))) (setq epkg-repository
(expand-file-name "var/epkgs/" user-emacs-directory))
(setq epkg-database-connector
(if (>= emacs-major-version 29) 'sqlite-builtin 'sqlite-module)))
(use-package custom (use-package custom
:no-require t :no-require t