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 67fca87c119ebe514b54ed37dcaf89ffcfa25bd9..658ceb77f499c9f6dbcf3073ebfa6afb41d8b8be 100644 (file)
--- 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