diff options
| author | Michael Albinus | 2016-10-11 16:53:33 +0200 |
|---|---|---|
| committer | Michael Albinus | 2016-10-11 16:53:33 +0200 |
| commit | 8b4aebf4559522d19193cc19cc8a255e764a8676 (patch) | |
| tree | 3b7e17063ee617ff7ff6a74a2388d8fe66f86ffc | |
| parent | 9640e9f4e95cd95c04875e90a4ff638e1e51f977 (diff) | |
| download | emacs-8b4aebf4559522d19193cc19cc8a255e764a8676.tar.gz emacs-8b4aebf4559522d19193cc19cc8a255e764a8676.zip | |
Use "26.1" version string in Tramp, fix some comments
* lisp/net/tramp-gvfs.el (tramp-gvfs-methods):
* lisp/net/tramp-sh.el (tramp-remote-process-environment):
Use "26.1" version string.
| -rw-r--r-- | lisp/net/tramp-compat.el | 2 | ||||
| -rw-r--r-- | lisp/net/tramp-gvfs.el | 5 | ||||
| -rw-r--r-- | lisp/net/tramp-gw.el | 1 | ||||
| -rw-r--r-- | lisp/net/tramp-sh.el | 2 | ||||
| -rw-r--r-- | lisp/net/tramp-smb.el | 2 | ||||
| -rw-r--r-- | lisp/net/tramp.el | 2 |
6 files changed, 10 insertions, 4 deletions
diff --git a/lisp/net/tramp-compat.el b/lisp/net/tramp-compat.el index 0d804fc0a48..e953170ed09 100644 --- a/lisp/net/tramp-compat.el +++ b/lisp/net/tramp-compat.el | |||
| @@ -118,7 +118,7 @@ Add the extension of F, if existing." | |||
| 118 | (extension (file-name-extension f t))) | 118 | (extension (file-name-extension f t))) |
| 119 | (make-temp-file prefix dir-flag extension))) | 119 | (make-temp-file prefix dir-flag extension))) |
| 120 | 120 | ||
| 121 | ;; `temporary-file-directory' as function is introduced with Emacs 25.2. | 121 | ;; `temporary-file-directory' as function is introduced with Emacs 26.1. |
| 122 | (defalias 'tramp-compat-temporary-file-directory-function | 122 | (defalias 'tramp-compat-temporary-file-directory-function |
| 123 | (if (fboundp 'temporary-file-directory) | 123 | (if (fboundp 'temporary-file-directory) |
| 124 | 'temporary-file-directory | 124 | 'temporary-file-directory |
diff --git a/lisp/net/tramp-gvfs.el b/lisp/net/tramp-gvfs.el index 6f1c01362ac..3d8d366daa4 100644 --- a/lisp/net/tramp-gvfs.el +++ b/lisp/net/tramp-gvfs.el | |||
| @@ -114,7 +114,7 @@ | |||
| 114 | '("afp" "dav" "davs" "gdrive" "obex" "sftp" "synce") | 114 | '("afp" "dav" "davs" "gdrive" "obex" "sftp" "synce") |
| 115 | "List of methods for remote files, accessed with GVFS." | 115 | "List of methods for remote files, accessed with GVFS." |
| 116 | :group 'tramp | 116 | :group 'tramp |
| 117 | :version "25.2" | 117 | :version "26.1" |
| 118 | :type '(repeat (choice (const "afp") | 118 | :type '(repeat (choice (const "afp") |
| 119 | (const "dav") | 119 | (const "dav") |
| 120 | (const "davs") | 120 | (const "davs") |
| @@ -1963,10 +1963,13 @@ They are retrieved from the hal daemon." | |||
| 1963 | 1963 | ||
| 1964 | ;; * Host name completion for existing mount points (afp-server, | 1964 | ;; * Host name completion for existing mount points (afp-server, |
| 1965 | ;; smb-server) or via smb-network. | 1965 | ;; smb-server) or via smb-network. |
| 1966 | ;; | ||
| 1966 | ;; * Check, how two shares of the same SMB server can be mounted in | 1967 | ;; * Check, how two shares of the same SMB server can be mounted in |
| 1967 | ;; parallel. | 1968 | ;; parallel. |
| 1969 | ;; | ||
| 1968 | ;; * Apply SDP on bluetooth devices, in order to filter out obex | 1970 | ;; * Apply SDP on bluetooth devices, in order to filter out obex |
| 1969 | ;; capability. | 1971 | ;; capability. |
| 1972 | ;; | ||
| 1970 | ;; * Implement obex for other serial communication but bluetooth. | 1973 | ;; * Implement obex for other serial communication but bluetooth. |
| 1971 | 1974 | ||
| 1972 | ;;; tramp-gvfs.el ends here | 1975 | ;;; tramp-gvfs.el ends here |
diff --git a/lisp/net/tramp-gw.el b/lisp/net/tramp-gw.el index 5f9720ff650..b631072ad1a 100644 --- a/lisp/net/tramp-gw.el +++ b/lisp/net/tramp-gw.el | |||
| @@ -331,6 +331,7 @@ password in password cache. This is done for the first try only." | |||
| 331 | ;;; TODO: | 331 | ;;; TODO: |
| 332 | 332 | ||
| 333 | ;; * Provide descriptive Commentary. | 333 | ;; * Provide descriptive Commentary. |
| 334 | ;; | ||
| 334 | ;; * Enable it for several gateway processes in parallel. | 335 | ;; * Enable it for several gateway processes in parallel. |
| 335 | 336 | ||
| 336 | ;;; tramp-gw.el ends here | 337 | ;;; tramp-gw.el ends here |
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index a7ac060f5be..6196b15237a 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el | |||
| @@ -566,7 +566,7 @@ which might have been set in the init files like ~/.profile. | |||
| 566 | Special handling is applied to the PATH environment, which should | 566 | Special handling is applied to the PATH environment, which should |
| 567 | not be set here. Instead, it should be set via `tramp-remote-path'." | 567 | not be set here. Instead, it should be set via `tramp-remote-path'." |
| 568 | :group 'tramp | 568 | :group 'tramp |
| 569 | :version "25.2" | 569 | :version "26.1" |
| 570 | :type '(repeat string) | 570 | :type '(repeat string) |
| 571 | :require 'tramp) | 571 | :require 'tramp) |
| 572 | 572 | ||
diff --git a/lisp/net/tramp-smb.el b/lisp/net/tramp-smb.el index 3b9c49eb26e..fe24edb3930 100644 --- a/lisp/net/tramp-smb.el +++ b/lisp/net/tramp-smb.el | |||
| @@ -2042,8 +2042,10 @@ Returns nil if an error message has appeared." | |||
| 2042 | ;;; TODO: | 2042 | ;;; TODO: |
| 2043 | 2043 | ||
| 2044 | ;; * Return more comprehensive file permission string. | 2044 | ;; * Return more comprehensive file permission string. |
| 2045 | ;; | ||
| 2045 | ;; * Try to remove the inclusion of dummy "" directory. Seems to be at | 2046 | ;; * Try to remove the inclusion of dummy "" directory. Seems to be at |
| 2046 | ;; several places, especially in `tramp-smb-handle-insert-directory'. | 2047 | ;; several places, especially in `tramp-smb-handle-insert-directory'. |
| 2048 | ;; | ||
| 2047 | ;; * Ignore case in file names. | 2049 | ;; * Ignore case in file names. |
| 2048 | 2050 | ||
| 2049 | ;;; tramp-smb.el ends here | 2051 | ;;; tramp-smb.el ends here |
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 44afc0aa6f0..7af40a818a1 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el | |||
| @@ -1959,7 +1959,7 @@ ARGS are the arguments OPERATION has been called with." | |||
| 1959 | ;; COMMAND. | 1959 | ;; COMMAND. |
| 1960 | ((member operation | 1960 | ((member operation |
| 1961 | '(process-file shell-command start-file-process | 1961 | '(process-file shell-command start-file-process |
| 1962 | ;; Emacs 25.2+ only. | 1962 | ;; Emacs 26+ only. |
| 1963 | make-nearby-temp-file temporary-file-directory)) | 1963 | make-nearby-temp-file temporary-file-directory)) |
| 1964 | default-directory) | 1964 | default-directory) |
| 1965 | ;; PROC. | 1965 | ;; PROC. |