summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Fitzsimmons <fitzsim@fitzsim.org>2015-04-27 22:26:56 -0400
committerThomas Fitzsimmons <fitzsim@fitzsim.org>2015-04-27 22:27:59 -0400
commit7d947e84f335e351aa5b959934e584aeecda4008 (patch)
tree4846d763d2e6d6df1aac24063e4caafc54932b8b
parentb09deaa5a9d54658f6432b0a5aa45c834e162c43 (diff)
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.
-rw-r--r--etc/NEWS3
-rw-r--r--lisp/net/eudc-vars.el6
2 files changed, 7 insertions, 2 deletions
diff --git a/etc/NEWS b/etc/NEWS
index 1a1492b669..5046d300d4 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 36a583daa4..5e994a3a38 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."