master 84d9d47: Prefer locate-user-emacs-file in gitmerge.el

[Stefan Kangas]

branch: master
commit 84d9d47660be203ba04f807a5a9de27151df7273
Author: Stefan Kangas <stefan@marxist.se>
Commit: Stefan Kangas <stefan@marxist.se>

    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'.
---
 admin/gitmerge.el | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/admin/gitmerge.el b/admin/gitmerge.el
index 67fca87..658ceb7 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