[Emacs-diffs] master 7d947e8: Change default location of EUDC options file

[Thomas Fitzsimmons]

branch: master
commit 7d947e84f335e351aa5b959934e584aeecda4008
Author: Thomas Fitzsimmons <address@hidden>
Commit: Thomas Fitzsimmons <address@hidden>

    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.
---
 etc/NEWS              |    3 +++
 lisp/net/eudc-vars.el |    6 ++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/etc/NEWS b/etc/NEWS
index 1a1492b..5046d30 100644
--- 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 36a583d..5e994a3 100644
--- 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."