diff options
| author | Alan Pearce | 2017-05-01 19:26:56 +0200 |
|---|---|---|
| committer | Alan Pearce | 2017-05-01 19:26:56 +0200 |
| commit | 6b7459d44bb7a162b1439c761d6c5ace197555e4 (patch) | |
| tree | a27d3b28709ee4389672997a8e4a362f988dae48 /emacs | |
| parent | 9cbe4dc1877a9ad431a5b989710b2e0cff8f3f13 (diff) | |
| download | nixfiles-6b7459d44bb7a162b1439c761d6c5ace197555e4.tar.lz nixfiles-6b7459d44bb7a162b1439c761d6c5ace197555e4.tar.zst nixfiles-6b7459d44bb7a162b1439c761d6c5ace197555e4.zip | |
Emacs: Replace deprecated system-name var with fun
Diffstat (limited to 'emacs')
| -rw-r--r-- | emacs/.emacs.d/init.org | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/emacs/.emacs.d/init.org b/emacs/.emacs.d/init.org index 7ac459d2..2b12d720 100644 --- a/emacs/.emacs.d/init.org +++ b/emacs/.emacs.d/init.org @@ -1314,8 +1314,8 @@ information here as well. ; 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 @@ information here as well. (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) |