Merge branch 'master' into drone/lua-mode

This commit is contained in:
Jonas Bernoulli
2025-10-25 18:52:52 +02:00
19 changed files with 26 additions and 18 deletions

View File

@@ -5,7 +5,6 @@
no-byte-compile = emacsql-mysql.el no-byte-compile = emacsql-mysql.el
no-byte-compile = emacsql-pg.el no-byte-compile = emacsql-pg.el
no-byte-compile = emacsql-psql.el no-byte-compile = emacsql-psql.el
no-byte-compile = emacsql-sqlite.el
no-byte-compile = emacsql-sqlite-module.el no-byte-compile = emacsql-sqlite-module.el
[submodule "lua-mode"] [submodule "lua-mode"]
no-byte-compile = init-tryout.el no-byte-compile = init-tryout.el

3
.gitmodules vendored
View File

@@ -13,6 +13,9 @@
[submodule "compat"] [submodule "compat"]
path = lib/compat path = lib/compat
url = https://github.com/emacs-compat/compat.git url = https://github.com/emacs-compat/compat.git
[submodule "cond-let"]
path = lib/cond-let
url = https://github.com/tarsius/cond-let
[submodule "dash"] [submodule "dash"]
path = lib/dash path = lib/dash
url = https://github.com/magnars/dash.el.git url = https://github.com/magnars/dash.el.git

View File

@@ -10,9 +10,10 @@ help helpall::
@printf "\n" @printf "\n"
bootstrap-borg: bootstrap-borg:
@mkdir .git/modules @ GITDIR="$$(realpath --relative-to=. "$$(git rev-parse --git-dir)")"; \
@git clone https://github.com/emacscollective/borg lib/borg \ mkdir "$$GITDIR/modules"; \
--separate-git-dir .git/modules/borg git clone https://github.com/emacscollective/borg lib/borg \
--separate-git-dir "$$GITDIR/modules/borg"
@cd lib/borg; git symbolic-ref HEAD refs/heads/main @cd lib/borg; git symbolic-ref HEAD refs/heads/main
@cd lib/borg; git reset --hard HEAD @cd lib/borg; git reset --hard HEAD

View File

@@ -75,6 +75,10 @@
;;; Long tail ;;; Long tail
(use-package cond-let
:config
(font-lock-add-keywords 'emacs-lisp-mode cond-let-font-lock-keywords t))
(use-package diff-hl (use-package diff-hl
:config :config
(setq diff-hl-draw-borders nil) (setq diff-hl-draw-borders nil)

1
lib/cond-let Submodule

Submodule lib/cond-let added at 09ebf1caa8