Minor connection-local variables fixes

* doc/emacs/custom.texi (Connection Variables): Warn about
specifying the same variable twice.

* lisp/files-x.el (connection-local-get-profiles): Normalize criteria.

diff --git a/doc/emacs/custom.texi b/doc/emacs/custom.texi
index 09473d7deb77afd799148fa332fac0504d0409fd..2bc39095f3cd15c503ce568b035cdee036bc12a9 100644 (file)
--- a/doc/emacs/custom.texi
+++ b/doc/emacs/custom.texi
@@ -1572,6 +1572,10 @@ discriminate for the properties @code{:protocol} (this is the Tramp
 method) or @code{:user} (a remote user name).  The @code{nil} criteria
 matches all buffers with a remote default directory.
 
+  Be careful when declaring different profiles with the same variable,
+and setting these profiles to criteria which could match in parallel.
+It is unspecified which variable value is used then.
+
 @node Key Bindings
 @section Customizing Key Bindings
 @cindex key bindings

diff --git a/lisp/files-x.el b/lisp/files-x.el
index 9b1a7a179022cb7f22caf485139af1006ed704d5..477ca059b2aac4e28e64f7691054e6a32b4bf612 100644 (file)
--- a/lisp/files-x.el
+++ b/lisp/files-x.el
@@ -644,7 +644,8 @@ Return a reordered plist."
   "Return the connection profiles list for CRITERIA.
 CRITERIA is a plist identifying a connection and the application
 using this connection, see `connection-local-criteria-alist'."
-  (let (profiles)
+  (let ((criteria (connection-local-normalize-criteria criteria))
+        profiles)
     (dolist (crit-alist connection-local-criteria-alist)
       (let ((crit criteria)
             (match t))