howard/hamacs
howard/hamacs
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removing need for f library at bootstrap level

Browse source 
Seems the f library isn't available in version 30 preview.
This commit is contained in:
Howard Abrams 2024-07-05 20:43:28 -07:00
parent f269ef0cb0
commit 90f919ca5b
1 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
bootstrap.org
View file

@ -141,7 +141,7 @@ And let’s see the results:
** My Code Location ** My Code Location
Much of my more complicated code comes from my website essays and other projects. The destination shows up here: Much of my more complicated code comes from my website essays and other projects. The destination shows up here:
#+begin_src emacs-lisp #+begin_src emacs-lisp
(add-to-list 'load-path (f-expand "~/.emacs.d/elisp")) (add-to-list 'load-path (expand-file-name "~/.emacs.d/elisp"))
#+end_src #+end_src
Hopefully, this will tie me over while I transition. Hopefully, this will tie me over while I transition.
@ -151,7 +151,7 @@ I actually run two instances of Emacs on some systems, where one instance has al
(defun ha-emacs-for-work? () (defun ha-emacs-for-work? ()
"Return non-nil when the Emacs instance is for work. "Return non-nil when the Emacs instance is for work.
Matches based on a `FOR_WORK' environment variable." Matches based on a `FOR_WORK' environment variable."
(and (f-dir? "~/work") (and (file-directory-p "~/work")
(getenv "FOR_WORK"))) (getenv "FOR_WORK")))
#+end_src #+end_src
@ -226,11 +226,12 @@ With this function, we can test/debug/reload any individual file, via:
"Load or reload an org-mode FILE containing literate "Load or reload an org-mode FILE containing literate
Emacs configuration code." Emacs configuration code."
(interactive (list (completing-read "Org file: " (interactive (list (completing-read "Org file: "
(ha-hamacs-files :all)))) (ha-hamacs-files :all))))
(let ((full-file (f-join hamacs-source-dir file))) ;; TODO: Replace concat here:
(when (f-exists? full-file) (let ((full-file (file-name-concat hamacs-source-dir file)))
(ignore-errors (when (file-exists-p full-file)
(org-babel-load-file full-file))))) (ignore-errors
(org-babel-load-file full-file)))))
#+end_src #+end_src
** Tangling the Hamacs ** Tangling the Hamacs
@ -242,11 +243,11 @@ And this similar function, will /tangle/ one of my files. Notice that in order t
configuration code." configuration code."
(interactive (list (completing-read "Org file: " (interactive (list (completing-read "Org file: "
(ha-hamacs-files :all)))) (ha-hamacs-files :all))))
(let ((full-file (f-join hamacs-source-dir file)) (let ((full-file (file-name-concat hamacs-source-dir file))
(target (file-name-concat "~/emacs.d/elisp" (target (file-name-concat "~/emacs.d/elisp"
(concat (file-name-sans-extension file) (concat (file-name-sans-extension file)
".el")))) ".el"))))
(when (f-exists? full-file) (when (file-exists-p full-file)
(ignore-errors (ignore-errors
(with-temp-buffer (with-temp-buffer
(insert-file-contents full-file) (insert-file-contents full-file)
@ -283,7 +284,7 @@ Changing my Emacs configuration is as simple as editing an Org file containing t
my literate Emacs configuration code." my literate Emacs configuration code."
(interactive (list (completing-read "Org file: " (interactive (list (completing-read "Org file: "
(ha-hamacs-files :all)))) (ha-hamacs-files :all))))
(let ((full-file (f-join hamacs-source-dir file))) (let ((full-file (file-name-concat hamacs-source-dir file)))
(find-file full-file))) (find-file full-file)))
#+end_src #+end_src