[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master b7d6160: Tune Tramp syntax
From: |
Michael Albinus |
Subject: |
[Emacs-diffs] master b7d6160: Tune Tramp syntax |
Date: |
Sat, 8 Apr 2017 12:35:20 -0400 (EDT) |
branch: master
commit b7d61609bd2a5a97b63733a4c16194850e48de2a
Author: Michael Albinus <address@hidden>
Commit: Michael Albinus <address@hidden>
Tune Tramp syntax
* lisp/net/tramp-cmds.el (tramp-change-syntax):
Use `tramp-syntax-values'.
* lisp/net/tramp-compat.el (tramp-compat-tramp-syntax): New defsubst.
* lisp/net/tramp.el (tramp-syntax): Rename possible values.
(tramp-syntax-values): New defun.
(tramp-prefix-format, tramp-method-regexp)
(tramp-postfix-method-format, tramp-prefix-ipv6-format)
(tramp-postfix-ipv6-format, tramp-postfix-host-format)
(tramp-completion-file-name-regexp): Use `tramp-compat-tramp-syntax'
and changed values.
(tramp-completion-file-name-regexp-default): Rename from
`tramp-completion-file-name-regexp-unified'. Adapt docstring.
(tramp-completion-file-name-regexp-simplified): Rename from
`tramp-completion-file-name-regexp-old-style'. Adapt docstring.
(tramp-initial-completion-file-name-regexp):
Use `tramp-completion-file-name-regexp-default'.
(tramp-run-real-handler): Do not autoload any longer.
---
lisp/net/tramp-cmds.el | 6 +--
lisp/net/tramp-compat.el | 8 ++++
lisp/net/tramp.el | 95 +++++++++++++++++++++++++-----------------------
3 files changed, 61 insertions(+), 48 deletions(-)
diff --git a/lisp/net/tramp-cmds.el b/lisp/net/tramp-cmds.el
index df6a5c5..99fc0cc 100644
--- a/lisp/net/tramp-cmds.el
+++ b/lisp/net/tramp-cmds.el
@@ -40,11 +40,11 @@
;;;###autoload
(defun tramp-change-syntax (&optional syntax)
"Change Tramp syntax.
-SYNTAX can be one of the symbols `def' (default), `ftp' (ange-ftp like)
-or `sep' (XEmacs like)."
+SYNTAX can be one of the symbols `default' (default),
+`simplified' (ange-ftp like) or `separate' (XEmacs like)."
(interactive
(let ((input (completing-read
- "Enter Tramp syntax: " '(def ftp sep) nil t
+ "Enter Tramp syntax: " (tramp-syntax-values) nil t
(symbol-name tramp-syntax))))
(unless (string-equal input "")
(list (intern input)))))
diff --git a/lisp/net/tramp-compat.el b/lisp/net/tramp-compat.el
index 8f346eb..732922b 100644
--- a/lisp/net/tramp-compat.el
+++ b/lisp/net/tramp-compat.el
@@ -379,6 +379,14 @@ If NAME is a remote file name, the local part of NAME is
unquoted."
(if (= (length localname) 2) "/" "") nil t localname)))
(concat (file-remote-p name) localname))))))
+;; `tramp-syntax' has changed its meaning in Emacs 26. We still
+;; support old settings.
+(defsubst tramp-compat-tramp-syntax ()
+ "Return proper value of `tramp-syntax'."
+ (cond ((eq tramp-syntax 'ftp) 'default)
+ ((eq tramp-syntax 'sep) 'separate)
+ (t tramp-syntax)))
+
(provide 'tramp-compat)
;;; TODO:
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index a6d3e78..8180546 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -662,29 +662,26 @@ Useful for \"rsync\" like methods.")
(put 'tramp-temp-buffer-file-name 'permanent-local t)
;;;###autoload
-(defcustom tramp-syntax 'def
+(defcustom tramp-syntax 'default
"Tramp filename syntax to be used.
It can have the following values:
- `def' -- Default syntax
- `ftp' -- Ange-FTP like syntax
- `sep' -- Syntax as defined for XEmacs originally."
+ `default' -- Default syntax
+ `simplified' -- Ange-FTP like syntax
+ `separate' -- Syntax as defined for XEmacs originally."
:group 'tramp
:version "26.1"
:package-version '(Tramp . "2.3.2")
- :type '(choice (const :tag "Default" def)
- (const :tag "Ange-FTP" ftp)
- (const :tag "XEmacs" sep))
+ :type '(choice (const :tag "Default" default)
+ (const :tag "Ange-FTP" simplified)
+ (const :tag "XEmacs" separate))
:require 'tramp
:initialize 'custom-initialize-set
:set (lambda (symbol value)
;; Check allowed values.
- (let ((values (cdr (get symbol 'custom-type))))
- (setq values (mapcar 'last values)
- values (mapcar 'car values))
- (unless (member value values)
- (user-error "Wrong `tramp-syntax' %s defined" tramp-syntax)))
+ (unless (memq value (tramp-syntax-values))
+ (user-error "Wrong `tramp-syntax' %s" tramp-syntax))
;; Cleanup existing buffers.
(unless (eq (symbol-value symbol) value)
(tramp-cleanup-all-buffers))
@@ -693,13 +690,19 @@ It can have the following values:
;; Rearrange file name handlers.
(tramp-register-file-name-handlers)))
+(defun tramp-syntax-values ()
+ "Return possible values of `tramp-syntax', a list"
+ (let ((values (cdr (get 'tramp-syntax 'custom-type))))
+ (setq values (mapcar 'last values)
+ values (mapcar 'car values))))
+
(defun tramp-prefix-format ()
"String matching the very beginning of Tramp file names.
Used in `tramp-make-tramp-file-name'."
- (cond ((eq tramp-syntax 'def) "/")
- ((eq tramp-syntax 'ftp) "/")
- ((eq tramp-syntax 'sep) "/[")
- (t (error "Wrong `tramp-syntax' %s defined" tramp-syntax))))
+ (cond ((eq (tramp-compat-tramp-syntax) 'default) "/")
+ ((eq (tramp-compat-tramp-syntax) 'simplified) "/")
+ ((eq (tramp-compat-tramp-syntax) 'separate) "/[")
+ (t (error "Wrong `tramp-syntax' %s" tramp-syntax))))
(defun tramp-prefix-regexp ()
"Regexp matching the very beginning of Tramp file names.
@@ -709,16 +712,16 @@ Should always start with \"^\". Derived from
`tramp-prefix-format'."
(defun tramp-method-regexp ()
"Regexp matching methods identifiers.
The `ftp' syntax does not support methods."
- (if (eq tramp-syntax 'ftp) "" "[a-zA-Z0-9-]+"))
+ (if (eq (tramp-compat-tramp-syntax) 'simplified) "" "[a-zA-Z0-9-]+"))
(defun tramp-postfix-method-format ()
"String matching delimiter between method and user or host names.
The `ftp' syntax does not support methods.
Used in `tramp-make-tramp-file-name'."
- (cond ((eq tramp-syntax 'def) ":")
- ((eq tramp-syntax 'ftp) "")
- ((eq tramp-syntax 'sep) "/")
- (t (error "Wrong `tramp-syntax' %s defined" tramp-syntax))))
+ (cond ((eq (tramp-compat-tramp-syntax) 'default) ":")
+ ((eq (tramp-compat-tramp-syntax) 'simplified) "")
+ ((eq (tramp-compat-tramp-syntax) 'separate) "/")
+ (t (error "Wrong `tramp-syntax' %s" tramp-syntax))))
(defun tramp-postfix-method-regexp ()
"Regexp matching delimiter between method and user or host names.
@@ -762,10 +765,10 @@ Derived from `tramp-postfix-user-format'.")
(defun tramp-prefix-ipv6-format ()
"String matching left hand side of IPv6 addresses.
Used in `tramp-make-tramp-file-name'."
- (cond ((eq tramp-syntax 'def) "[")
- ((eq tramp-syntax 'ftp) "[")
- ((eq tramp-syntax 'sep) "")
- (t (error "Wrong `tramp-syntax' %s defined" tramp-syntax))))
+ (cond ((eq (tramp-compat-tramp-syntax) 'default) "[")
+ ((eq (tramp-compat-tramp-syntax) 'simplified) "[")
+ ((eq (tramp-compat-tramp-syntax) 'separate) "")
+ (t (error "Wrong `tramp-syntax' %s" tramp-syntax))))
(defun tramp-prefix-ipv6-regexp ()
"Regexp matching left hand side of IPv6 addresses.
@@ -782,10 +785,10 @@ Derived from `tramp-prefix-ipv6-format'."
(defun tramp-postfix-ipv6-format ()
"String matching right hand side of IPv6 addresses.
Used in `tramp-make-tramp-file-name'."
- (cond ((eq tramp-syntax 'def) "]")
- ((eq tramp-syntax 'ftp) "]")
- ((eq tramp-syntax 'sep) "")
- (t (error "Wrong `tramp-syntax' %s defined" tramp-syntax))))
+ (cond ((eq (tramp-compat-tramp-syntax) 'default) "]")
+ ((eq (tramp-compat-tramp-syntax) 'simplified) "]")
+ ((eq (tramp-compat-tramp-syntax) 'separate) "")
+ (t (error "Wrong `tramp-syntax' %s" tramp-syntax))))
(defun tramp-postfix-ipv6-regexp ()
"Regexp matching right hand side of IPv6 addresses.
@@ -820,10 +823,10 @@ Derived from `tramp-postfix-hop-format'.")
(defun tramp-postfix-host-format ()
"String matching delimiter between host names and localnames.
Used in `tramp-make-tramp-file-name'."
- (cond ((eq tramp-syntax 'def) ":")
- ((eq tramp-syntax 'ftp) ":")
- ((eq tramp-syntax 'sep) "]")
- (t (error "Wrong `tramp-syntax' %s defined" tramp-syntax))))
+ (cond ((eq (tramp-compat-tramp-syntax) 'default) ":")
+ ((eq (tramp-compat-tramp-syntax) 'simplified) ":")
+ ((eq (tramp-compat-tramp-syntax) 'separate) "]")
+ (t (error "Wrong `tramp-syntax' %s" tramp-syntax))))
(defun tramp-postfix-host-regexp ()
"Regexp matching delimiter between host names and localnames.
@@ -890,7 +893,7 @@ This regexp should match Tramp file names but no other file
names."
It must match the initial `tramp-syntax' settings.")
;;;###autoload
-(defconst tramp-completion-file-name-regexp-unified
+(defconst tramp-completion-file-name-regexp-default
(concat
"\\`/\\("
;; Optional multi hop.
@@ -904,12 +907,12 @@ It must match the initial `tramp-syntax' settings.")
;; Method separator, user name and host name.
"\\(:[^/|:]*\\)?"
"\\)?\\'")
- "Value for `tramp-completion-file-name-regexp' for unified remoting.
+ "Value for `tramp-completion-file-name-regexp' for default remoting.
See `tramp-file-name-structure' for more explanations.
On W32 systems, the volume letter must be ignored.")
-(defconst tramp-completion-file-name-regexp-old-style
+(defconst tramp-completion-file-name-regexp-simplified
(concat
"\\`/\\("
;; Optional multi hop.
@@ -921,7 +924,7 @@ On W32 systems, the volume letter must be ignored.")
;; At least one character.
"[^/|:]+")
"\\)?\\'")
- "Value for `tramp-completion-file-name-regexp' for ange-ftp style remoting.
+ "Value for `tramp-completion-file-name-regexp' for simplified style remoting.
See `tramp-file-name-structure' for more explanations.
On W32 systems, the volume letter must be ignored.")
@@ -941,14 +944,17 @@ before loading tramp.el. Alternatively,
`file-name-handler-alist' can be
updated after changing this variable.
Also see `tramp-file-name-structure'."
- (cond ((eq tramp-syntax 'def) tramp-completion-file-name-regexp-unified)
- ((eq tramp-syntax 'ftp) tramp-completion-file-name-regexp-old-style)
- ((eq tramp-syntax 'sep) tramp-completion-file-name-regexp-separate)
- (t (error "Wrong `tramp-syntax' %s defined" tramp-syntax))))
+ (cond ((eq (tramp-compat-tramp-syntax) 'default)
+ tramp-completion-file-name-regexp-default)
+ ((eq (tramp-compat-tramp-syntax) 'simplified)
+ tramp-completion-file-name-regexp-simplified)
+ ((eq (tramp-compat-tramp-syntax) 'separate)
+ tramp-completion-file-name-regexp-separate)
+ (t (error "Wrong `tramp-syntax' %s" tramp-syntax))))
;;;###autoload
(defconst tramp-initial-completion-file-name-regexp
- tramp-completion-file-name-regexp-unified
+ tramp-completion-file-name-regexp-default
"Value for `tramp-completion-file-name-regexp' for autoload.
It must match the initial `tramp-syntax' settings.")
@@ -1911,8 +1917,7 @@ coding system might not be determined. This function
repairs it."
;; as regexp.
(push (cons (regexp-quote tmpname) (cdr elt)) result)))))
-;;;###autoload
-(progn (defun tramp-run-real-handler (operation args)
+(defun tramp-run-real-handler (operation args)
"Invoke normal file name handler for OPERATION.
First arg specifies the OPERATION, second arg is a list of arguments to
pass to the OPERATION."
@@ -1926,7 +1931,7 @@ pass to the OPERATION."
,(and (eq inhibit-file-name-operation operation)
inhibit-file-name-handlers)))
(inhibit-file-name-operation operation))
- (apply operation args))))
+ (apply operation args)))
;; We handle here all file primitives. Most of them have the file
;; name as first parameter; nevertheless we check for them explicitly
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master b7d6160: Tune Tramp syntax,
Michael Albinus <=