ryuslash/emacs-config
1
0
Fork 0
Code Activity

Compare commits

base: ryuslash:23ee5ed080bd249564e17e4fadd80223a37ed9fd
Branches Tags
ryuslash:master
...
compare: ryuslash:ec54fa9d049c349701039a4b3ee9150505a1a1cb
Branches Tags
ryuslash:master

4 commits
23ee5ed080 ... ec54fa9d04

Author SHA1 Message Date
Tom Willemse
ec54fa9d04 Ignore any ‘.elc’ files 2023-05-25 15:47:22 -07:00
Tom Willemse
c2f624bf89 Remove oni-markdown package 
It's just an empty file on my disk that hasn't been committed.
 2023-05-25 15:46:36 -07:00
Tom Willemse
60b361fdae Fix variable reference 
Oops, must have accidentally screwed this up when I changed the name. Will
probably move the guile code into its own file at some point, though.
 2023-05-25 15:45:57 -07:00
Tom Willemse
09615b953a [oni-core] Require ‘consult’ when byte-compiling ‘oni-core’ 
When everything is interpreted it all works fine because ‘consult’ is loaded
before the ‘with-eval-after-load’ part is run, but when byte compiling the byte
compiler doesn't know that ‘consult-customize’ is a macro unless ‘consult’ is
loaded, which it isn't when Guix compiles it.

When it's byte-compiled as if it's a function ‘consult-buffer’ is assumed to be
a variable that's passed in, so I'm guessing it's trying to dereference it first
before passing it on to a non-existent function? But of course ‘consult-buffer’
is only a function (Emacs Lisp is a Lisp-2 after all), so it fails, but only
when byte compiled (and even only when byte-compiled in a clean environment
where there are no packages loaded that aren't explicity said to be).

Hopefully this fixes my issue with being unable to switch buffers until I
explicitly load ‘consult’.
 2023-05-25 15:29:42 -07:00
3 changed files with 6 additions and 8 deletions
Show stats Expand all files Collapse all files

1
.gitignore vendored
View file

@ -4,3 +4,4 @@
/*/.eldev/ /*/.eldev/
generated-config.yml* generated-config.yml*
*.elc

5
GNUmakefile
View file

@ -31,7 +31,7 @@ define GUILE_MODULE
(loop (read-line p))))))))) (loop (read-line p)))))))))
endef endef
$(guile GUILE_MODULE)) $(guile $(GUILE_MODULE))
define upload = define upload =
emacs --quick --batch \ emacs --quick --batch \
@ -287,9 +287,6 @@ bin/$(guile (get-module-version "oni-magit")): oni-magit.el
bin/$(guile (get-module-version "oni-makefile")): oni-makefile.el bin/$(guile (get-module-version "oni-makefile")): oni-makefile.el
$(call upload,\"$<\") $(call upload,\"$<\")
bin/$(guile (get-module-version "oni-markdown")): oni-markdown.el
$(call upload,\"$<\")
bin/$(guile (get-module-version "oni-notmuch")): oni-notmuch.el bin/$(guile (get-module-version "oni-notmuch")): oni-notmuch.el
$(call upload,\"$<\") $(call upload,\"$<\")

8
oni-core.el
View file

@ -4,7 +4,7 @@
;; Author: Tom Willemse <tom@ryuslash.org> ;; Author: Tom Willemse <tom@ryuslash.org>
;; Keywords: local ;; Keywords: local
;; Version: 2023.0524.235720 ;; Version: 2023.0525.151855
;; Package-Requires: (oni-data-dir oni-embrace oni-hydra expand-region multiple-cursors gcmh diminish ws-butler which-key insert-char-preview mixed-pitch ace-window vertico marginalia orderless consult embark docstr mini-frame) ;; Package-Requires: (oni-data-dir oni-embrace oni-hydra expand-region multiple-cursors gcmh diminish ws-butler which-key insert-char-preview mixed-pitch ace-window vertico marginalia orderless consult embark docstr mini-frame)
;; This program is free software; you can redistribute it and/or modify ;; This program is free software; you can redistribute it and/or modify
@ -450,14 +450,14 @@ _s_: String list"
:enabled buffer-file-name :enabled buffer-file-name
:action find-file)) :action find-file))
(defun oni-core-remove-consult-buffer-preview () (eval-when-compile
(consult-customize consult-buffer :preview-key nil)) (require 'consult))
(with-eval-after-load 'consult (with-eval-after-load 'consult
(with-eval-after-load 'related-files (with-eval-after-load 'related-files
(add-to-list 'consult-buffer-sources 'oni-core-related-places-source)) (add-to-list 'consult-buffer-sources 'oni-core-related-places-source))
(oni-core-remove-consult-buffer-preview)) (consult-customize consult-buffer :preview-key nil))
;;; Embark ;;; Embark