From 6a0f048292de512ed58e21bb9a87ae29f56af4be Mon Sep 17 00:00:00 2001
From: Alison Watson <marrub.xz@gmail.com>
Date: Wed, 5 Feb 2020 23:04:38 -0500
Subject: [PATCH] emacs: use xdg directory for emacs 27.1

---
 emacs/init.el | 29 ++++++++++++++++-------------
 links         |  6 +++---
 2 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/emacs/init.el b/emacs/init.el
index 73c0c03..f0a1f14 100644
--- a/emacs/init.el
+++ b/emacs/init.el
@@ -1,18 +1,21 @@
 ;; startup
-(setq auto-save-default nil
-      backup-directory-alist '((".*" . "~/.emacs.d/backup"))
-      create-lockfiles nil
-      custom-file "~/.emacs.d/custom.el"
-      gc-cons-threshold 64000000
-      global-mark-ring-max 1024
-      inhibit-compacting-font-caches t
-      inhibit-startup-screen t
-      initial-buffer-choice "~/org/init.org"
-      initial-scratch-message nil
-      mark-ring-max 1024)
+(let ((usr-backup (locate-user-emacs-file "backup"))
+      (usr-custom (locate-user-emacs-file "custom.el"))
+      (usr-data   (locate-user-emacs-file "data.el")))
+  (setq auto-save-default nil
+        backup-directory-alist `((".*" . ,usr-backup))
+        create-lockfiles nil
+        custom-file usr-custom
+        gc-cons-threshold 64000000
+        global-mark-ring-max 1024
+        inhibit-compacting-font-caches t
+        inhibit-startup-screen t
+        initial-buffer-choice "~/org/init.org"
+        initial-scratch-message nil
+        mark-ring-max 1024)
 
-(load custom-file)
-(load "~/.emacs.d/data.el")
+  (load custom-file)
+  (load usr-data))
 
 (defalias #'yes-or-no-p #'y-or-n-p)
 
diff --git a/links b/links
index c6cdd73..25b7c8b 100644
--- a/links
+++ b/links
@@ -20,9 +20,9 @@ applications/xprofile                ~/.xprofile
 build-system/cargo.toml              ~/.cargo/config
 build-system/makepkg.conf            ~/.config/pacman/makepkg.conf
 computers/(hostname)/vconf           ~/.vim/vconf
-emacs/custom.el                      ~/.emacs.d/custom.el
-emacs/data.el                        ~/.emacs.d/data.el
-emacs/init.el                        ~/.emacs.d/init.el
+emacs/custom.el                      ~/.config/emacs/custom.el
+emacs/data.el                        ~/.config/emacs/data.el
+emacs/init.el                        ~/.config/emacs/init.el
 games/alephone/marathon-1.xml        ~/.alephone/Marathon Preferences
 games/alephone/marathon-2.xml        ~/.alephone/Marathon 2 Preferences
 games/alephone/marathon-infinity.xml ~/.alephone/Marathon Infinity Preferences