Rework connection local variables

For connection local variables interface, `class' is renamed
to `profile'.  All arguments `criteria' are a plist now.

* doc/lispref/variables.texi (Connection Local Variables):
Rewrite.

* lisp/files-x.el (connection-local-profile-alist): Rename
from `connection-local-class-alist'.  Adapt docstring.
(connection-local-criteria-alist): Adapt docstring.
(connection-local-normalize-criteria): New defun.
(connection-local-get-profiles): Rename from
`connection-local-get-classes'.  Rewrite.
(connection-local-set-profiles): Rename from
`connection-local-set-classes'.  Rewrite.
(connection-local-get-profile-variables): Rename from
`connection-local-get-class-variables'.  Rewrite.
(connection-local-set-profile-variables): Rename from
`connection-local-set-class-variables'.  Rewrite.
(hack-connection-local-variables)
(hack-connection-local-variables-apply)): Rewrite.
(with-connection-local-profiles): Rename from
`ith-connection-local-classes'.  Rewrite.

* lisp/net/tramp.el (tramp-set-connection-local-variables):
Compute criteria.

* lisp/net/tramp-cmds.el (tramp-bug):
Use `connection-local-profile-alist'.

* test/lisp/files-x-tests.el (files-x-test--variables1)
(files-x-test--variables2, files-x-test--variables3)
(files-x-test--variables4, files-x-test--criteria1)
(files-x-test--criteria2): Make them a defconst.
(files-x-test--application)
(files-x-test--another-application, files-x-test--protocol)
(files-x-test--user, files-x-test--machine): New defconst.
(files-x-test--criteria): New defvar.
(files-x-test--criteria3): Remove.
(files-x-test-connection-local-set-profile-variables):
Rename from `files-x-test-connection-local-set-class-variables'.
Rewrite.
(files-x-test-connection-local-set-profiles): Rename from
`files-x-test-connection-local-set-classes'.  Rewrite.
(files-x-test-hack-connection-local-variables-apply)  Rewrite.
(files-x-test-with-connection-local-profiles): Rename from
`files-x-test-with-connection-local-classes'.  Rewrite.

1 files changed, 75 insertions, 77 deletions

diff --git a/doc/lispref/variables.texi b/doc/lispref/variables.texi
index 8a61018a612..2818ea067d2 100644
--- a/doc/lispref/variables.texi
+++ b/doc/lispref/variables.texi
@@ -1979,24 +1979,21 @@ still respecting file-local variables (@pxref{File Local Variables}).
 @section Connection Local Variables
 @cindex connection local variables
 
-  Connection-local variables provide a general mechanism for
-different variable settings in buffers with a remote default
-directory.  They are bound and set depending on the remote connection
-a buffer is dedicated to.  Per default, they are set in all process
-buffers for a remote connection, but they could be applied also in
-other buffers with a remote directory.
-
-@defun connection-local-set-class-variables class variables
-This function defines a set of variable settings for the named
-@var{class}, which is a symbol.  You can later assign the class to one
-or more remote connections, and Emacs will apply those variable
-settings to all process buffers for those connections.  The list in
-@var{variables} is an alist of the form @code{(@var{name}
-. @var{value})}.  Example:
+  Connection-local variables provide a general mechanism for different
+variable settings in buffers with a remote connection.  They are bound
+and set depending on the remote connection a buffer is dedicated to.
+
+@defun connection-local-set-profile-variables profile variables
+This function defines a set of variable settings for the connection
+@var{profile}, which is a symbol.  You can later assign the connection
+profile to one or more remote connections, and Emacs will apply those
+variable settings to all process buffers for those connections.  The
+list in @var{variables} is an alist of the form
+@code{(@var{name}@tie{}.@tie{}@var{value})}.  Example:
 
 @example
 @group
-(connection-local-set-class-variables
+(connection-local-set-profile-variables
   'remote-bash
   '((shell-file-name . "/bin/bash")
     (shell-command-switch . "-c")
@@ -2005,7 +2002,7 @@ settings to all process buffers for those connections.  The list in
 @end group
 
 @group
-(connection-local-set-class-variables
+(connection-local-set-profile-variables
   'remote-ksh
   '((shell-file-name . "/bin/ksh")
     (shell-command-switch . "-c")
@@ -2014,38 +2011,41 @@ settings to all process buffers for those connections.  The list in
 @end group
 
 @group
-(connection-local-set-class-variables
+(connection-local-set-profile-variables
   'remote-null-device
   '((null-device . "/dev/null")))
 @end group
 @end example
 @end defun
 
-@defvar connection-local-class-alist
-This alist holds the class symbols and the associated variable
-settings.  It is updated by @code{connection-local-set-class-variables}.
+@defvar connection-local-profile-alist
+This alist holds the connection profile symbols and the associated
+variable settings.  It is updated by
+@code{connection-local-set-profile-variables}.
 @end defvar
 
-@defun connection-local-set-classes criteria &rest classes
-This function assigns @var{classes}, which are symbols, to all remote
-connections identified by @var{criteria}.  @var{criteria} is either a
-regular expression identifying a remote server, or a function with one
-argument @var{identification}, which must return non-nil when a remote
-server shall apply @var{classes} variables, or @code{nil}.
-
-If @var{criteria} is a regexp, is must match the result of
-@code{(file-remote-p default-directory)} of a buffer in order to apply
-the variables setting.  Example:
+@defun connection-local-set-profiles criteria &rest profiles
+This function assigns @var{profiles}, which are symbols, to all remote
+connections identified by @var{criteria}.  @var{criteria} is a plist
+identifying a connection and the application using this connection.
+Property names might be @code{:application}, @code{:protocol},
+@code{:user} and @code{:machine}.  The property value of
+@code{:application} is a symbol, all other property values are
+strings.  All properties are optional; if @var{criteria} is nil, it
+always applies.  Example:
 
 @example
 @group
-(connection-local-set-classes
-  "^/ssh:" 'remote-bash 'remote-null-device)
+(connection-local-set-profiles
+  '(:application 'tramp :protocol "ssh" :machine "localhost")
+  'remote-bash 'remote-null-device)
 @end group
 
 @group
-(connection-local-set-classes
-  "^/sudo:" 'remote-ksh 'remote-null-device)
+(connection-local-set-profiles
+  '(:application 'tramp :protocol "sudo"
+    :user "root" :machine "localhost")
+  'remote-ksh 'remote-null-device)
 @end group
 @end example
 
@@ -2053,82 +2053,80 @@ the variables setting.  Example:
 Therefore, the example above would be equivalent to
 
 @example
-(connection-local-set-classes "^/ssh:" 'remote-bash)
-(connection-local-set-classes "^/sudo:" 'remote-ksh)
-(connection-local-set-classes nil 'remote-null-device)
-@end example
-
-  If @var{criteria} is a lambda function it must accept one parameter,
-the identification.  The example above could be rewritten as
-
-@example
 @group
-(connection-local-set-classes
-  (lambda (identification)
-    (string-equal (file-remote-p identification 'method) "ssh"))
+(connection-local-set-profiles
+  '(:application 'tramp :protocol "ssh" :machine "localhost")
   'remote-bash)
 @end group
 
 @group
-(connection-local-set-classes
-  (lambda (identification)
-    (string-equal (file-remote-p identification 'method) "sudo"))
+(connection-local-set-profiles
+  '(:application 'tramp :protocol "sudo"
+    :user "root" :machine "localhost")
   'remote-ksh)
 @end group
 
 @group
-(connection-local-set-classes
-  (lambda (identification) t)
-  'remote-null-device)
+(connection-local-set-profiles
+  nil 'remote-null-device)
 @end group
 @end example
 
-  Thereafter, all the variable settings specified for @var{classes}
-will be applied to any buffer with a matching remote directory, when
-activated by @code{hack-connection-local-variables-apply}.  Any class
-of @var{classes} must have been already defined by
-@code{connection-local-set-class-variables}.
+  Any connection profile of @var{profiles} must have been already
+defined by @code{connection-local-set-profile-variables}.
 @end defun
 
 @defvar connection-local-criteria-alist
-This alist contains remote server identifications and their assigned
-class names.  The function @code{connection-local-set-classes} updates
-this list.
+This alist contains connection criteria and their assigned profile
+names.  The function @code{connection-local-set-profiles} updates this
+list.
 @end defvar
 
-@defun hack-connection-local-variables
-This function collects applicable connection-local variables in
-@code{connection-local-variables-alist} that is local to the buffer,
-without applying them.  Whether a connection-local variable is
-applicable is specified by the remote identifier of a buffer,
-evaluated by @code{(file-remote-p default-directory)}.
+@defun hack-connection-local-variables criteria
+This function collects applicable connection-local variables
+associated with @var{criteria} in
+@code{connection-local-variables-alist}, without applying them.
+Example:
+
+@example
+@group
+(hack-connection-local-variables
+  '(:application 'tramp :protocol "ssh" :machine "localhost"))
+@end group
+
+@group
+connection-local-variables-alist
+     @result{} ((null-device . "/dev/null")
+        (shell-login-switch . "-l")
+        (shell-interactive-switch . "-i")
+        (shell-command-switch . "-c")
+        (shell-file-name . "/bin/bash"))
+@end group
+@end example
 @end defun
 
-@defun hack-connection-local-variables-apply
-This function looks for connection-local variables, and immediately
-applies them in the current buffer.  It is called per default for
-every process-buffer related to a remote connection.  For other remote
-buffers, it could be called by any mode.
+@defun hack-connection-local-variables-apply criteria
+This function looks for connection-local variables according to
+@var{criteria}, and immediately applies them in the current buffer.
 @end defun
 
-@defmac with-connection-local-classes classes &rest body
-All connection-local variables, which are specified by a class in
-@var{classes}, are applied.  An implicit binding of the classes to the
-remote connection is enabled.
+@defmac with-connection-local-profiles profiles &rest body
+All connection-local variables, which are specified by a connection
+profile in @var{profiles}, are applied.
 
 After that, @var{body} is executed, and the connection-local variables
 are unwound.  Example:
 
 @example
 @group
-(connection-local-set-class-variables
+(connection-local-set-profile-variables
   'remote-perl
   '((perl-command-name . "/usr/local/bin/perl")
     (perl-command-switch . "-e %s")))
 @end group
 
 @group
-(with-connection-local-classes '(remote-perl)
+(with-connection-local-profiles '(remote-perl)
   do something useful)
 @end group
 @end example