diff options
| author | Stefan Kangas | 2021-11-23 11:39:21 +0100 |
|---|---|---|
| committer | Stefan Kangas | 2021-11-23 11:41:02 +0100 |
| commit | 84d9d47660be203ba04f807a5a9de27151df7273 (patch) | |
| tree | 5b57a9d4c2ec63a0fe271bb47cc1e1a854c62110 /admin | |
| parent | 5c4136f56465c6b2c65fb3577603879cdbbe7f97 (diff) | |
| download | emacs-84d9d47660be203ba04f807a5a9de27151df7273.tar.gz emacs-84d9d47660be203ba04f807a5a9de27151df7273.zip | |
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'.
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/gitmerge.el | 3 |
1 files changed, 1 insertions, 2 deletions
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")) | |||
| 68 | (defvar gitmerge-minimum-missing 10 | 68 | (defvar gitmerge-minimum-missing 10 |
| 69 | "Minimum number of missing commits to consider merging in batch mode.") | 69 | "Minimum number of missing commits to consider merging in batch mode.") |
| 70 | 70 | ||
| 71 | (defvar gitmerge-status-file (expand-file-name "gitmerge-status" | 71 | (defvar gitmerge-status-file (locate-user-emacs-file "gitmerge-status") |
| 72 | user-emacs-directory) | ||
| 73 | "File where missing commits will be saved between sessions.") | 72 | "File where missing commits will be saved between sessions.") |
| 74 | 73 | ||
| 75 | (defvar gitmerge-ignore-branches-regexp | 74 | (defvar gitmerge-ignore-branches-regexp |