all repos — nixfiles @ 6b7459d44bb7a162b1439c761d6c5ace197555e4

System and user configuration, managed by nix and home-manager

Emacs: Replace deprecated system-name var with fun

Alan Pearce
commit

6b7459d44bb7a162b1439c761d6c5ace197555e4

parent

9cbe4dc1877a9ad431a5b989710b2e0cff8f3f13

1 file changed, 3 insertions(+), 3 deletions(-)

jump to
M emacs/.emacs.d/init.orgemacs/.emacs.d/init.org
@@ -1314,8 +1314,8 @@ ; load this in a post-frame hook because gpg-agent asks for a password on first
; startup and caches it. Don't want emacs daemon to hang because of gpg-agent. (defun load-private-data () (interactive) - (if (not (file-exists-p (expand-file-name (concat system-name ".el.gpg") user-emacs-directory))) - (message "No encrypted configuration matches system name `%s'" system-name) + (if (not (file-exists-p (expand-file-name (concat (system-name) ".el.gpg") user-emacs-directory))) + (message "No encrypted configuration matches system name `%s'" (system-name)) (if (not have-private-key) (message "ERROR: Private GPG key not found") (unless (or (getenv "GPG_AGENT_INFO")
@@ -1327,7 +1327,7 @@ (unless (file-exists-p (concat pinentry--socket-dir "pinentry"))
(pinentry-start) (add-hook 'kill-emacs-hook 'pinentry-stop)) (add-to-list 'load-suffixes ".el.gpg") - (load-gpg (expand-file-name system-name user-emacs-directory))))) + (load-gpg (expand-file-name (system-name) user-emacs-directory))))) (defun first-frame-hook (frame) (remove-hook 'after-make-frame-functions #'first-frame-hook)