From: Stefan Kangas <stefan@marxist.se>
Date: Mon, 19 Apr 2021 07:50:13 +0000 (+0200)
Subject: Don't hard-code "~/.emacs.d/" in two more places
X-Git-Tag: emacs-28.0.90~2817
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=07bb2cbf5558d3ec048ab02be95060aa6efceff5;p=emacs.git

Don't hard-code "~/.emacs.d/" in two more places

* lisp/gnus/gnus-group.el (gnus-read-ephemeral-bug-group):
* lisp/progmodes/js.el (js-js-tmpdir): Don't hard-code
"~/.emacs.d/".
---

diff --git a/lisp/gnus/gnus-group.el b/lisp/gnus/gnus-group.el
index 423b180408a..8c62c9424de 100644
--- a/lisp/gnus/gnus-group.el
+++ b/lisp/gnus/gnus-group.el
@@ -2462,7 +2462,8 @@ the ephemeral group."
             (with-temp-file tmpfile
               (mm-disable-multibyte)
               (dolist (id ids)
-                (let ((file (concat "~/.emacs.d/debbugs-cache/" id)))
+                (let ((file (expand-file-name id (locate-user-emacs-file
+                                                  "debbugs-cache"))))
                   (if (and (not gnus-plugged)
                            (file-exists-p file))
                       (insert-file-contents file)
diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el
index eb690a72f6e..6d6063d783c 100644
--- a/lisp/progmodes/js.el
+++ b/lisp/progmodes/js.el
@@ -494,10 +494,11 @@ for preventing Firefox from stealing the keyboard focus."
   :type 'boolean)
 
 (defcustom js-js-tmpdir
-  "~/.emacs.d/js/js"
+  (locate-user-emacs-file "js/js")
   "Temporary directory used by `js-mode' to communicate with Mozilla.
 This directory must be readable and writable by both Mozilla and Emacs."
-  :type 'directory)
+  :type 'directory
+  :version "28.1")
 
 (defcustom js-js-timeout 5
   "Reply timeout for executing commands in Mozilla via `js-mode'.