Change default location of EUDC options file

* NEWS: Document change to EUDC options file's default location.
* lisp/net/eudc-vars.el (eudc-options-file): Use
`locate-user-emacs-file' to change default options file location.

diff --git a/etc/NEWS b/etc/NEWS
index 1a1492b66977a277b69a0f43a38edf9bec2b5128..5046d300d450d207c9e582f1a9e67629eeaf44b6 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -633,6 +633,9 @@ to avoid interfering with the kill ring.
 *** Custom variable `eudc-inline-expansion-format' defaults to
 "Firstname Surname <mail-address>".
 
+*** Custom variable `eudc-options-file' defaults to
+"~/.emacs.d/eudc-options".
+
 *** New custom variable `ldap-ldapsearch-password-prompt-regexp' to
 allow overriding the regular expression that recognizes the ldapsearch
 command line's password prompt.

diff --git a/lisp/net/eudc-vars.el b/lisp/net/eudc-vars.el
index 36a583daa4d9c2f156f40d84d46b6360ce902db7..5e994a3a38f26f50df0651d9ddfebd70f56c6f21 100644 (file)
--- a/lisp/net/eudc-vars.el
+++ b/lisp/net/eudc-vars.el
@@ -312,9 +312,11 @@ arguments that should be passed to the program."
                        :inline t
                        (string :tag "Argument")))))
 
-(defcustom eudc-options-file "~/.eudc-options"
+(defcustom eudc-options-file
+  (locate-user-emacs-file "eudc-options" ".eudc-options")
   "A file where the `servers' hotlist is stored."
-  :type '(file :Tag "File Name:"))
+  :type '(file :Tag "File Name:")
+  :version "25.1")
 
 (defcustom eudc-mode-hook nil
   "Normal hook run on entry to EUDC mode."