Merge branch 'emacs-25-merge'

[gnu-emacs] / lisp / net / eudc-vars.el

diff --git a/lisp/net/eudc-vars.el b/lisp/net/eudc-vars.el
index 36a583daa4d9c2f156f40d84d46b6360ce902db7..de7e25a66aa3ef3a87a8c39074aad01016d25a75 100644 (file)
--- a/lisp/net/eudc-vars.el
+++ b/lisp/net/eudc-vars.el
@@ -1,4 +1,4 @@
-;;; eudc-vars.el --- Emacs Unified Directory Client -*- coding: utf-8 -*-
+;;; eudc-vars.el --- Emacs Unified Directory Client
 
 ;; Copyright (C) 1998-2015 Free Software Foundation, Inc.
 
@@ -50,7 +50,7 @@ instead."
 
 ;; Known protocols (used in completion)
 ;; Not to be mistaken with `eudc-supported-protocols'
-(defvar eudc-known-protocols '(bbdb ph ldap))
+(defvar eudc-known-protocols '(bbdb ldap))
 
 (defcustom eudc-server-hotlist nil
   "Directory servers to query.
@@ -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."
@@ -355,6 +357,10 @@ BBDB fields.  SPECs are sexps which are evaluated:
                       (symbol :tag "BBDB Field")
                       (sexp :tag "Conversion Spec"))))
 
+(make-obsolete-variable 'eudc-ph-bbdb-conversion-alist
+                        "the EUDC PH/QI backend is obsolete."
+                        "25.1")
+
 ;;}}}
 
 ;;{{{ LDAP Custom Group
@@ -367,7 +373,8 @@ BBDB fields.  SPECs are sexps which are evaluated:
   '((name . cn)
     (net . mail)
     (address . (eudc-bbdbify-address postaladdress "Address"))
-    (phone . ((eudc-bbdbify-phone telephonenumber "Phone"))))
+    (phone . (eudc-bbdbify-phone telephonenumber "Phone"))
+    (company . (eudc-bbdbify-company o)))
   "A mapping from BBDB to LDAP attributes.
 This is a list of cons cells (BBDB-FIELD . SPEC-OR-LIST) where
 BBDB-FIELD is the name of a field that must be defined in your BBDB