From: Stefan Kangas <stefan@marxist.se>
Date: Tue, 23 Nov 2021 10:39:21 +0000 (+0100)
Subject: Prefer locate-user-emacs-file in gitmerge.el
X-Git-Tag: emacs-29.0.90~2852^2~89
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=84d9d47660be203ba04f807a5a9de27151df7273;p=emacs.git

Prefer locate-user-emacs-file in gitmerge.el

* admin/gitmerge.el (gitmerge-status-file): Prefer
'locate-user-emacs-file' to fiddling with 'user-emacs-directory'.
---

diff --git a/admin/gitmerge.el b/admin/gitmerge.el
index 67fca87c119..658ceb77f49 100644
--- a/admin/gitmerge.el
+++ b/admin/gitmerge.el
@@ -68,8 +68,7 @@ bump Emacs version\\|Auto-commit"))
 (defvar gitmerge-minimum-missing 10
   "Minimum number of missing commits to consider merging in batch mode.")
 
-(defvar gitmerge-status-file (expand-file-name "gitmerge-status"
-					       user-emacs-directory)
+(defvar gitmerge-status-file (locate-user-emacs-file "gitmerge-status")
   "File where missing commits will be saved between sessions.")
 
 (defvar gitmerge-ignore-branches-regexp