phundrak/dotfiles
1
0
Fork 0
Code Issues Pull Requests Activity

[Emacs] Config now correctly tangles without errors

Browse Source 
Previously, some code relied on dash.el to generate some code when
tangling my Emacs config, but if Emacs was to be launched without an
up to date tangled configuration, it would attempt to automatically
tangle it. However, due to dash.el not being loaded, it could not find
some of the required functions.

This commit replaces these functions with handmade functions that can
be loaded at tangle-time, and tangling always works.
This commit is contained in:
Lucien Cartier-Tilet 2021-04-06 09:40:36 +02:00
parent 5b8ac32b15
commit 3689587800
Signed by: phundrak
GPG Key ID: BD7789E705CB8DCA
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
org/config/emacs.org
View File

@ -1741,6 +1741,7 @@ argument. Here is how it is implemented:
:PROPERTIES: :PROPERTIES:
:CUSTOM_ID: User-Configuration-Custom-functions-macros-and-variables-Elisp-Utilities-and-Predicates-phundrak-filter-2d3c5a5b :CUSTOM_ID: User-Configuration-Custom-functions-macros-and-variables-Elisp-Utilities-and-Predicates-phundrak-filter-2d3c5a5b
:END: :END:
#+name: elisp-phundrak-filter
#+BEGIN_SRC emacs-lisp #+BEGIN_SRC emacs-lisp
(defun phundrak-filter (fn list) (defun phundrak-filter (fn list)
"Filter `LIST' according to the predicate `FN'. "Filter `LIST' according to the predicate `FN'.
@ -1787,6 +1788,7 @@ success, otherwise it is a failure. Note that empty lists will always return
In the same vein as ~phundrak-all?~, ~phundrak-none?~ checks if all elements of In the same vein as ~phundrak-all?~, ~phundrak-none?~ checks if all elements of
~seq~ do not satify the predicate ~fn~. Again, if the list is empty, it will ~seq~ do not satify the predicate ~fn~. Again, if the list is empty, it will
return ~t~. return ~t~.
#+name: elisp-phundrak-none
#+BEGIN_SRC emacs-lisp #+BEGIN_SRC emacs-lisp
(defun phundrak-none? (fn seq) (defun phundrak-none? (fn seq)
"Check if all members of `SEQ' do not satisfy predicate `FN'. "Check if all members of `SEQ' do not satisfy predicate `FN'.
@ -1816,6 +1818,7 @@ This simple function helps me return either the value ~var~ holds, or if it is
:PROPERTIES: :PROPERTIES:
:CUSTOM_ID: User-Configuration-Custom-functions-macros-and-variables-Elisp-Utilities-and-Predicates-phundrak-zip-8a49b20f :CUSTOM_ID: User-Configuration-Custom-functions-macros-and-variables-Elisp-Utilities-and-Predicates-phundrak-zip-8a49b20f
:END: :END:
#+name: elisp-phundrak-zip
#+BEGIN_SRC emacs-lisp #+BEGIN_SRC emacs-lisp
(defun phundrak-zip (&rest lists) (defun phundrak-zip (&rest lists)
"Zip `LISTS' together. "Zip `LISTS' together.
@ -5263,16 +5266,23 @@ I want to see by default how much battery my computer has, so let’s enable it:
:CUSTOM_ID: User-Configuration-Visual-configuration-Better-faces-5d73fe9c :CUSTOM_ID: User-Configuration-Visual-configuration-Better-faces-5d73fe9c
:END: :END:
#+NAME: face-generate #+NAME: face-generate
#+BEGIN_SRC emacs-lisp :tangle no :results replace :exports none :var input=mu4e-faces :var makeface="yes" #+headers: :var input=mu4e-faces :var makeface="yes"
#+BEGIN_SRC emacs-lisp :tangle no :results replace :exports none :noweb yes
<<elisp-phundrak-filter>>
<<elisp-phundrak-none>>
<<elisp-phundrak-zip>>
(let* ((makeface (string= "yes" makeface)) (let* ((makeface (string= "yes" makeface))
(headers (cadr input)) (headers (cadr input))
(faces (-map (lambda (face) (faces (mapcar (lambda (face)
(phundrak-filter (lambda (elem) (phundrak-filter (lambda (elem)
(or (numberp (cadr elem)) (or (numberp (cadr elem))
(not (string= "" (not (string= ""
(cadr elem))))) (cadr elem)))))
(phundrak-zip headers face))) (phundrak-zip headers face)))
(cddr input)))) (cddr input))))
(mapconcat (lambda (face) (mapconcat (lambda (face)
(concat (concat
;; (if makeface ;; (if makeface