diff options
| author | Paul Eggert | 2020-01-05 11:44:48 -0800 |
|---|---|---|
| committer | Paul Eggert | 2020-01-05 11:44:48 -0800 |
| commit | 38db41ddb3c0a0be2c898f560245b962e4611dc2 (patch) | |
| tree | 54c44664deec9593845036d2e84cf995d52f0620 | |
| parent | 26fde487cb3740cdc678e76c62f1320d47b4d6f5 (diff) | |
| parent | 05c5bf4d388bc1b53525ea83ed329e13611ee6d7 (diff) | |
| download | emacs-38db41ddb3c0a0be2c898f560245b962e4611dc2.tar.gz emacs-38db41ddb3c0a0be2c898f560245b962e4611dc2.zip | |
Merge from origin/emacs-27
05c5bf4d38 * lisp/net/tramp.el: Fix typos.
| -rw-r--r-- | lisp/net/tramp.el | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 85330e98aa2..52c6a9ec430 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el | |||
| @@ -1033,7 +1033,7 @@ initial value is overwritten by the car of `tramp-file-name-structure'.") | |||
| 1033 | 1033 | ||
| 1034 | ;;;###autoload | 1034 | ;;;###autoload |
| 1035 | (defcustom tramp-ignored-file-name-regexp nil | 1035 | (defcustom tramp-ignored-file-name-regexp nil |
| 1036 | "Regular expression matching file names that are not under Tramp’s control." | 1036 | "Regular expression matching file names that are not under Tramp's control." |
| 1037 | :version "27.1" | 1037 | :version "27.1" |
| 1038 | :type '(choice (const nil) regexp)) | 1038 | :type '(choice (const nil) regexp)) |
| 1039 | 1039 | ||
| @@ -1341,8 +1341,8 @@ This function removes from NAME the specification of the remote | |||
| 1341 | host and the method of accessing the host, leaving only the part | 1341 | host and the method of accessing the host, leaving only the part |
| 1342 | that identifies NAME locally on the remote system. NAME must be | 1342 | that identifies NAME locally on the remote system. NAME must be |
| 1343 | a string that matches `tramp-file-name-regexp'. The returned | 1343 | a string that matches `tramp-file-name-regexp'. The returned |
| 1344 | file name can be used directly as argument of ‘process-file’, | 1344 | file name can be used directly as argument of `process-file', |
| 1345 | ‘start-file-process’, or ‘shell-command’." | 1345 | `start-file-process', or `shell-command'." |
| 1346 | (save-match-data | 1346 | (save-match-data |
| 1347 | (and (tramp-tramp-file-p name) | 1347 | (and (tramp-tramp-file-p name) |
| 1348 | (string-match (nth 0 tramp-file-name-structure) name) | 1348 | (string-match (nth 0 tramp-file-name-structure) name) |
| @@ -3799,10 +3799,10 @@ support symbolic links." | |||
| 3799 | filename)))) | 3799 | filename)))) |
| 3800 | 3800 | ||
| 3801 | (defconst tramp-time-dont-know '(0 0 0 1000) | 3801 | (defconst tramp-time-dont-know '(0 0 0 1000) |
| 3802 | "An invalid time value, used as \"Don’t know\" value.") | 3802 | "An invalid time value, used as \"Don't know\" value.") |
| 3803 | 3803 | ||
| 3804 | (defconst tramp-time-doesnt-exist '(-1 65535) | 3804 | (defconst tramp-time-doesnt-exist '(-1 65535) |
| 3805 | "An invalid time value, used as \"Doesn’t exist\" value.") | 3805 | "An invalid time value, used as \"Doesn't exist\" value.") |
| 3806 | 3806 | ||
| 3807 | (defun tramp-handle-set-visited-file-modtime (&optional time-list) | 3807 | (defun tramp-handle-set-visited-file-modtime (&optional time-list) |
| 3808 | "Like `set-visited-file-modtime' for Tramp files." | 3808 | "Like `set-visited-file-modtime' for Tramp files." |