procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
* admin/gitmerge.el (gitmerge-status-file): Prefer
'locate-user-emacs-file' to fiddling with 'user-emacs-directory'.
This commit is contained in:
Stefan Kangas 2021-11-23 11:39:21 +01:00
parent 5c4136f564
commit 84d9d47660
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
admin/gitmerge.el
View file

@ -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