diff options
| author | Paul Eggert | 2015-08-25 18:58:54 -0700 |
|---|---|---|
| committer | Paul Eggert | 2015-08-25 19:00:21 -0700 |
| commit | b12cfbfda0141e7312bff4b466f35da4debc438d (patch) | |
| tree | 11bf93eba498d0087a5d5a0d0144b59084eeb122 | |
| parent | 27b2cff245fb1c22f831b63810d1266c92b31ba6 (diff) | |
| download | emacs-b12cfbfda0141e7312bff4b466f35da4debc438d.tar.gz emacs-b12cfbfda0141e7312bff4b466f35da4debc438d.zip | |
Go back to grave quoting in Tramp
* lisp/net/tramp-adb.el:
* lisp/net/tramp-cache.el:
* lisp/net/tramp-compat.el:
* lisp/net/tramp-gvfs.el:
* lisp/net/tramp-gw.el:
* lisp/net/tramp-sh.el:
* lisp/net/tramp-smb.el:
* lisp/net/tramp.el:
Stick with grave quoting in diagnostics strings. This is more
portable to older Emacs, desirable for Tramp.
* lisp/net/tramp-cache.el: Use ‘format-message’, not ‘format’,
for diagnostic that needs requoting.
* lisp/net/tramp-compat.el (format-message):
Fall back on simple ‘format’, since that’s good enough now.
| -rw-r--r-- | lisp/net/tramp-adb.el | 44 | ||||
| -rw-r--r-- | lisp/net/tramp-cache.el | 4 | ||||
| -rw-r--r-- | lisp/net/tramp-compat.el | 24 | ||||
| -rw-r--r-- | lisp/net/tramp-gvfs.el | 22 | ||||
| -rw-r--r-- | lisp/net/tramp-gw.el | 8 | ||||
| -rw-r--r-- | lisp/net/tramp-sh.el | 188 | ||||
| -rw-r--r-- | lisp/net/tramp-smb.el | 36 | ||||
| -rw-r--r-- | lisp/net/tramp.el | 4 |
8 files changed, 160 insertions, 170 deletions
diff --git a/lisp/net/tramp-adb.el b/lisp/net/tramp-adb.el index 9ef78a03fda..f818fcd61d6 100644 --- a/lisp/net/tramp-adb.el +++ b/lisp/net/tramp-adb.el | |||
| @@ -258,7 +258,7 @@ pass to the OPERATION." | |||
| 258 | method user host | 258 | method user host |
| 259 | (with-tramp-file-property v localname "file-truename" | 259 | (with-tramp-file-property v localname "file-truename" |
| 260 | (let ((result nil)) ; result steps in reverse order | 260 | (let ((result nil)) ; result steps in reverse order |
| 261 | (tramp-message v 4 "Finding true name for ‘%s’" filename) | 261 | (tramp-message v 4 "Finding true name for `%s'" filename) |
| 262 | (let* ((directory-sep-char ?/) | 262 | (let* ((directory-sep-char ?/) |
| 263 | (steps (tramp-compat-split-string localname "/")) | 263 | (steps (tramp-compat-split-string localname "/")) |
| 264 | (localnamedir (tramp-run-real-handler | 264 | (localnamedir (tramp-run-real-handler |
| @@ -290,9 +290,9 @@ pass to the OPERATION." | |||
| 290 | (list thisstep)) | 290 | (list thisstep)) |
| 291 | "/"))))) | 291 | "/"))))) |
| 292 | (cond ((string= "." thisstep) | 292 | (cond ((string= "." thisstep) |
| 293 | (tramp-message v 5 "Ignoring step ‘.’")) | 293 | (tramp-message v 5 "Ignoring step `.'")) |
| 294 | ((string= ".." thisstep) | 294 | ((string= ".." thisstep) |
| 295 | (tramp-message v 5 "Processing step ‘..’") | 295 | (tramp-message v 5 "Processing step `..'") |
| 296 | (pop result)) | 296 | (pop result)) |
| 297 | ((stringp symlink-target) | 297 | ((stringp symlink-target) |
| 298 | ;; It's a symlink, follow it. | 298 | ;; It's a symlink, follow it. |
| @@ -307,7 +307,7 @@ pass to the OPERATION." | |||
| 307 | (unless (tramp-equal-remote filename symlink-target) | 307 | (unless (tramp-equal-remote filename symlink-target) |
| 308 | (tramp-error | 308 | (tramp-error |
| 309 | v 'file-error | 309 | v 'file-error |
| 310 | "Symlink target ‘%s’ on wrong host" symlink-target)) | 310 | "Symlink target `%s' on wrong host" symlink-target)) |
| 311 | (setq symlink-target localname)) | 311 | (setq symlink-target localname)) |
| 312 | (setq steps | 312 | (setq steps |
| 313 | (append (tramp-compat-split-string | 313 | (append (tramp-compat-split-string |
| @@ -330,7 +330,7 @@ pass to the OPERATION." | |||
| 330 | (not (string= (substring result -1) "/")))) | 330 | (not (string= (substring result -1) "/")))) |
| 331 | (setq result (concat result "/")))) | 331 | (setq result (concat result "/")))) |
| 332 | 332 | ||
| 333 | (tramp-message v 4 "True name of ‘%s’ is ‘%s’" localname result) | 333 | (tramp-message v 4 "True name of `%s' is `%s'" localname result) |
| 334 | result)))) | 334 | result)))) |
| 335 | 335 | ||
| 336 | ;; Preserve trailing "/". | 336 | ;; Preserve trailing "/". |
| @@ -433,7 +433,7 @@ pass to the OPERATION." | |||
| 433 | 433 | ||
| 434 | (defun tramp-adb-get-ls-command (vec) | 434 | (defun tramp-adb-get-ls-command (vec) |
| 435 | (with-tramp-connection-property vec "ls" | 435 | (with-tramp-connection-property vec "ls" |
| 436 | (tramp-message vec 5 "Finding a suitable ‘ls’ command") | 436 | (tramp-message vec 5 "Finding a suitable `ls' command") |
| 437 | (if (tramp-adb-send-command-and-check vec "ls --color=never -al /dev/null") | 437 | (if (tramp-adb-send-command-and-check vec "ls --color=never -al /dev/null") |
| 438 | ;; On CyanogenMod based system BusyBox is used and "ls" output | 438 | ;; On CyanogenMod based system BusyBox is used and "ls" output |
| 439 | ;; coloring is enabled by default. So we try to disable it | 439 | ;; coloring is enabled by default. So we try to disable it |
| @@ -514,7 +514,7 @@ Emacs dired can't find files." | |||
| 514 | (make-directory par parents)))) | 514 | (make-directory par parents)))) |
| 515 | (tramp-adb-barf-unless-okay | 515 | (tramp-adb-barf-unless-okay |
| 516 | v (format "mkdir %s" (tramp-shell-quote-argument localname)) | 516 | v (format "mkdir %s" (tramp-shell-quote-argument localname)) |
| 517 | "Couldn’t make directory %s" dir) | 517 | "Couldn't make directory %s" dir) |
| 518 | (tramp-flush-file-property v (file-name-directory localname)) | 518 | (tramp-flush-file-property v (file-name-directory localname)) |
| 519 | (tramp-flush-directory-property v localname))) | 519 | (tramp-flush-directory-property v localname))) |
| 520 | 520 | ||
| @@ -528,7 +528,7 @@ Emacs dired can't find files." | |||
| 528 | v (format "%s %s" | 528 | v (format "%s %s" |
| 529 | (if recursive "rm -r" "rmdir") | 529 | (if recursive "rm -r" "rmdir") |
| 530 | (tramp-shell-quote-argument localname)) | 530 | (tramp-shell-quote-argument localname)) |
| 531 | "Couldn’t delete %s" directory))) | 531 | "Couldn't delete %s" directory))) |
| 532 | 532 | ||
| 533 | (defun tramp-adb-handle-delete-file (filename &optional _trash) | 533 | (defun tramp-adb-handle-delete-file (filename &optional _trash) |
| 534 | "Like `delete-file' for Tramp files." | 534 | "Like `delete-file' for Tramp files." |
| @@ -538,7 +538,7 @@ Emacs dired can't find files." | |||
| 538 | (tramp-flush-file-property v localname) | 538 | (tramp-flush-file-property v localname) |
| 539 | (tramp-adb-barf-unless-okay | 539 | (tramp-adb-barf-unless-okay |
| 540 | v (format "rm %s" (tramp-shell-quote-argument localname)) | 540 | v (format "rm %s" (tramp-shell-quote-argument localname)) |
| 541 | "Couldn’t delete %s" filename))) | 541 | "Couldn't delete %s" filename))) |
| 542 | 542 | ||
| 543 | (defun tramp-adb-handle-file-name-all-completions (filename directory) | 543 | (defun tramp-adb-handle-file-name-all-completions (filename directory) |
| 544 | "Like `file-name-all-completions' for Tramp files." | 544 | "Like `file-name-all-completions' for Tramp files." |
| @@ -571,7 +571,7 @@ Emacs dired can't find files." | |||
| 571 | (unless (file-exists-p (file-truename filename)) | 571 | (unless (file-exists-p (file-truename filename)) |
| 572 | (tramp-error | 572 | (tramp-error |
| 573 | v 'file-error | 573 | v 'file-error |
| 574 | "Cannot make local copy of non-existing file ‘%s’" filename)) | 574 | "Cannot make local copy of non-existing file `%s'" filename)) |
| 575 | (let ((tmpfile (tramp-compat-make-temp-file filename))) | 575 | (let ((tmpfile (tramp-compat-make-temp-file filename))) |
| 576 | (with-tramp-progress-reporter | 576 | (with-tramp-progress-reporter |
| 577 | v 3 (format "Fetching %s to tmp file %s" filename tmpfile) | 577 | v 3 (format "Fetching %s to tmp file %s" filename tmpfile) |
| @@ -580,7 +580,7 @@ Emacs dired can't find files." | |||
| 580 | (not (file-exists-p tmpfile))) | 580 | (not (file-exists-p tmpfile))) |
| 581 | (ignore-errors (delete-file tmpfile)) | 581 | (ignore-errors (delete-file tmpfile)) |
| 582 | (tramp-error | 582 | (tramp-error |
| 583 | v 'file-error "Cannot make local copy of file ‘%s’" filename)) | 583 | v 'file-error "Cannot make local copy of file `%s'" filename)) |
| 584 | (set-file-modes | 584 | (set-file-modes |
| 585 | tmpfile | 585 | tmpfile |
| 586 | (logior (or (file-modes filename) 0) | 586 | (logior (or (file-modes filename) 0) |
| @@ -636,10 +636,10 @@ But handle the case, if the \"test\" command is not available." | |||
| 636 | (list start end tmpfile append 'no-message lockname confirm)) | 636 | (list start end tmpfile append 'no-message lockname confirm)) |
| 637 | (with-tramp-progress-reporter | 637 | (with-tramp-progress-reporter |
| 638 | v 3 (format-message | 638 | v 3 (format-message |
| 639 | "Moving tmp file ‘%s’ to ‘%s’" tmpfile filename) | 639 | "Moving tmp file `%s' to `%s'" tmpfile filename) |
| 640 | (unwind-protect | 640 | (unwind-protect |
| 641 | (when (tramp-adb-execute-adb-command v "push" tmpfile localname) | 641 | (when (tramp-adb-execute-adb-command v "push" tmpfile localname) |
| 642 | (tramp-error v 'file-error "Cannot write: ‘%s’" filename)) | 642 | (tramp-error v 'file-error "Cannot write: `%s'" filename)) |
| 643 | (delete-file tmpfile))) | 643 | (delete-file tmpfile))) |
| 644 | 644 | ||
| 645 | (when (or (eq visit t) (stringp visit)) | 645 | (when (or (eq visit t) (stringp visit)) |
| @@ -648,7 +648,7 @@ But handle the case, if the \"test\" command is not available." | |||
| 648 | (unless (equal curbuf (current-buffer)) | 648 | (unless (equal curbuf (current-buffer)) |
| 649 | (tramp-error | 649 | (tramp-error |
| 650 | v 'file-error | 650 | v 'file-error |
| 651 | "Buffer has changed from ‘%s’ to ‘%s’" curbuf (current-buffer)))))) | 651 | "Buffer has changed from `%s' to `%s'" curbuf (current-buffer)))))) |
| 652 | 652 | ||
| 653 | (defun tramp-adb-handle-set-file-modes (filename mode) | 653 | (defun tramp-adb-handle-set-file-modes (filename mode) |
| 654 | "Like `set-file-modes' for Tramp files." | 654 | "Like `set-file-modes' for Tramp files." |
| @@ -713,7 +713,7 @@ PRESERVE-UID-GID and PRESERVE-EXTENDED-ATTRIBUTES are completely ignored." | |||
| 713 | (tramp-flush-file-property v localname) | 713 | (tramp-flush-file-property v localname) |
| 714 | (when (tramp-adb-execute-adb-command v "push" filename localname) | 714 | (when (tramp-adb-execute-adb-command v "push" filename localname) |
| 715 | (tramp-error | 715 | (tramp-error |
| 716 | v 'file-error "Cannot copy ‘%s’ ‘%s’" filename newname)))))) | 716 | v 'file-error "Cannot copy `%s' `%s'" filename newname)))))) |
| 717 | 717 | ||
| 718 | ;; KEEP-DATE handling. | 718 | ;; KEEP-DATE handling. |
| 719 | (when keep-date | 719 | (when keep-date |
| @@ -1114,7 +1114,7 @@ the exit status is not equal 0, and t otherwise." | |||
| 1114 | (goto-char (point-max)) | 1114 | (goto-char (point-max)) |
| 1115 | (unless (re-search-backward "tramp_exit_status [0-9]+" nil t) | 1115 | (unless (re-search-backward "tramp_exit_status [0-9]+" nil t) |
| 1116 | (tramp-error | 1116 | (tramp-error |
| 1117 | vec 'file-error "Couldn’t find exit status of ‘%s’" command)) | 1117 | vec 'file-error "Couldn't find exit status of `%s'" command)) |
| 1118 | (skip-chars-forward "^ ") | 1118 | (skip-chars-forward "^ ") |
| 1119 | (prog1 | 1119 | (prog1 |
| 1120 | (zerop (read (current-buffer))) | 1120 | (zerop (read (current-buffer))) |
| @@ -1131,7 +1131,7 @@ FMT and ARGS are passed to `error'." | |||
| 1131 | "Wait for output from remote command." | 1131 | "Wait for output from remote command." |
| 1132 | (unless (buffer-live-p (process-buffer proc)) | 1132 | (unless (buffer-live-p (process-buffer proc)) |
| 1133 | (delete-process proc) | 1133 | (delete-process proc) |
| 1134 | (tramp-error proc 'file-error "Process ‘%s’ not available, try again" proc)) | 1134 | (tramp-error proc 'file-error "Process `%s' not available, try again" proc)) |
| 1135 | (with-current-buffer (process-buffer proc) | 1135 | (with-current-buffer (process-buffer proc) |
| 1136 | (if (tramp-wait-for-regexp proc timeout tramp-adb-prompt) | 1136 | (if (tramp-wait-for-regexp proc timeout tramp-adb-prompt) |
| 1137 | (let (buffer-read-only) | 1137 | (let (buffer-read-only) |
| @@ -1151,11 +1151,11 @@ FMT and ARGS are passed to `error'." | |||
| 1151 | (if timeout | 1151 | (if timeout |
| 1152 | (tramp-error | 1152 | (tramp-error |
| 1153 | proc 'file-error | 1153 | proc 'file-error |
| 1154 | "[[Remote adb prompt ‘%s’ not found in %d secs]]" | 1154 | "[[Remote adb prompt `%s' not found in %d secs]]" |
| 1155 | tramp-adb-prompt timeout) | 1155 | tramp-adb-prompt timeout) |
| 1156 | (tramp-error | 1156 | (tramp-error |
| 1157 | proc 'file-error | 1157 | proc 'file-error |
| 1158 | "[[Remote prompt ‘%s’ not found]]" tramp-adb-prompt))))) | 1158 | "[[Remote prompt `%s' not found]]" tramp-adb-prompt))))) |
| 1159 | 1159 | ||
| 1160 | (defun tramp-adb-maybe-open-connection (vec) | 1160 | (defun tramp-adb-maybe-open-connection (vec) |
| 1161 | "Maybe open a connection VEC. | 1161 | "Maybe open a connection VEC. |
| @@ -1178,7 +1178,7 @@ connection if a previous connection has died for some reason." | |||
| 1178 | ;; use a connection property, because we have not checked yet | 1178 | ;; use a connection property, because we have not checked yet |
| 1179 | ;; whether it is still the same device. | 1179 | ;; whether it is still the same device. |
| 1180 | (when (and user (not (tramp-get-file-property vec "" "su-command-p" t))) | 1180 | (when (and user (not (tramp-get-file-property vec "" "su-command-p" t))) |
| 1181 | (tramp-error vec 'file-error "Cannot switch to user ‘%s’" user)) | 1181 | (tramp-error vec 'file-error "Cannot switch to user `%s'" user)) |
| 1182 | 1182 | ||
| 1183 | (unless | 1183 | (unless |
| 1184 | (and p (processp p) (memq (process-status p) '(run open))) | 1184 | (and p (processp p) (memq (process-status p) '(run open))) |
| @@ -1224,7 +1224,7 @@ connection if a previous connection has died for some reason." | |||
| 1224 | (not (string-equal old-getprop new-getprop))) | 1224 | (not (string-equal old-getprop new-getprop))) |
| 1225 | (tramp-message | 1225 | (tramp-message |
| 1226 | vec 3 | 1226 | vec 3 |
| 1227 | "Connection reset, because remote host changed from ‘%s’ to ‘%s’" | 1227 | "Connection reset, because remote host changed from `%s' to `%s'" |
| 1228 | old-getprop new-getprop) | 1228 | old-getprop new-getprop) |
| 1229 | (tramp-cleanup-connection vec t) | 1229 | (tramp-cleanup-connection vec t) |
| 1230 | (tramp-adb-maybe-open-connection vec))) | 1230 | (tramp-adb-maybe-open-connection vec))) |
| @@ -1236,7 +1236,7 @@ connection if a previous connection has died for some reason." | |||
| 1236 | (delete-process p) | 1236 | (delete-process p) |
| 1237 | (tramp-set-file-property vec "" "su-command-p" nil) | 1237 | (tramp-set-file-property vec "" "su-command-p" nil) |
| 1238 | (tramp-error | 1238 | (tramp-error |
| 1239 | vec 'file-error "Cannot switch to user ‘%s’" user))) | 1239 | vec 'file-error "Cannot switch to user `%s'" user))) |
| 1240 | 1240 | ||
| 1241 | ;; Set "remote-path" connection property. This is needed | 1241 | ;; Set "remote-path" connection property. This is needed |
| 1242 | ;; for eshell. | 1242 | ;; for eshell. |
diff --git a/lisp/net/tramp-cache.el b/lisp/net/tramp-cache.el index c1d6a284a76..8f60ac401f1 100644 --- a/lisp/net/tramp-cache.el +++ b/lisp/net/tramp-cache.el | |||
| @@ -440,8 +440,8 @@ for all methods. Resulting data are derived from connection history." | |||
| 440 | (clrhash tramp-cache-data)) | 440 | (clrhash tramp-cache-data)) |
| 441 | (error | 441 | (error |
| 442 | ;; File is corrupted. | 442 | ;; File is corrupted. |
| 443 | (message "Tramp persistency file ‘%s’ is corrupted: %s" | 443 | (format-message "Tramp persistency file `%s' is corrupted: %s" |
| 444 | tramp-persistency-file-name (error-message-string err)) | 444 | tramp-persistency-file-name (error-message-string err)) |
| 445 | (clrhash tramp-cache-data)))) | 445 | (clrhash tramp-cache-data)))) |
| 446 | 446 | ||
| 447 | (add-hook 'tramp-unload-hook | 447 | (add-hook 'tramp-unload-hook |
diff --git a/lisp/net/tramp-compat.el b/lisp/net/tramp-compat.el index 48eda2fd174..817c71334db 100644 --- a/lisp/net/tramp-compat.el +++ b/lisp/net/tramp-compat.el | |||
| @@ -236,8 +236,8 @@ this is the function `temp-directory'." | |||
| 236 | ((let ((d (getenv "TMPDIR"))) (and d (file-directory-p d))) | 236 | ((let ((d (getenv "TMPDIR"))) (and d (file-directory-p d))) |
| 237 | (file-name-as-directory (getenv "TMPDIR"))) | 237 | (file-name-as-directory (getenv "TMPDIR"))) |
| 238 | ((file-exists-p "c:/temp") (file-name-as-directory "c:/temp")) | 238 | ((file-exists-p "c:/temp") (file-name-as-directory "c:/temp")) |
| 239 | (t (message (concat "Neither ‘temporary-file-directory’ nor " | 239 | (t (message (concat "Neither `temporary-file-directory' nor " |
| 240 | "‘temp-directory’ is defined -- using /tmp.")) | 240 | "`temp-directory' is defined -- using /tmp.")) |
| 241 | (file-name-as-directory "/tmp"))))) | 241 | (file-name-as-directory "/tmp"))))) |
| 242 | 242 | ||
| 243 | ;; `make-temp-file' exists in Emacs only. On XEmacs, we use our own | 243 | ;; `make-temp-file' exists in Emacs only. On XEmacs, we use our own |
| @@ -294,7 +294,7 @@ Not actually used. Use `(format \"%o\" i)' instead?" | |||
| 294 | (let ((x (or ostr ""))) | 294 | (let ((x (or ostr ""))) |
| 295 | ;; `save-match' is in `tramp-mode-string-to-int' which calls this. | 295 | ;; `save-match' is in `tramp-mode-string-to-int' which calls this. |
| 296 | (unless (string-match "\\`[0-7]*\\'" x) | 296 | (unless (string-match "\\`[0-7]*\\'" x) |
| 297 | (error "Non-octal junk in string ‘%s’" x)) | 297 | (error "Non-octal junk in string `%s'" x)) |
| 298 | (string-to-number ostr 8))) | 298 | (string-to-number ostr 8))) |
| 299 | 299 | ||
| 300 | ;; ID-FORMAT does not exist in XEmacs. | 300 | ;; ID-FORMAT does not exist in XEmacs. |
| @@ -535,9 +535,9 @@ EOL-TYPE can be one of `dos', `unix', or `mac'." | |||
| 535 | ((eq eol-type 'mac) 'cr) | 535 | ((eq eol-type 'mac) 'cr) |
| 536 | (t | 536 | (t |
| 537 | (error | 537 | (error |
| 538 | "Unknown EOL-TYPE ‘%s’, must be ‘dos’, ‘unix’, or ‘mac’" | 538 | "Unknown EOL-TYPE `%s', must be `dos', `unix', or `mac'" |
| 539 | eol-type))))) | 539 | eol-type))))) |
| 540 | (t (error "Can’t change EOL conversion -- is MULE missing?")))) | 540 | (t (error "Can't change EOL conversion -- is MULE missing?")))) |
| 541 | 541 | ||
| 542 | ;; `replace-regexp-in-string' does not exist in XEmacs. | 542 | ;; `replace-regexp-in-string' does not exist in XEmacs. |
| 543 | ;; Implementation is taken from Emacs 24. | 543 | ;; Implementation is taken from Emacs 24. |
| @@ -595,21 +595,11 @@ and replace a sub-expression, e.g. | |||
| 595 | (unless (fboundp 'default-toplevel-value) | 595 | (unless (fboundp 'default-toplevel-value) |
| 596 | (defalias 'default-toplevel-value 'symbol-value)) | 596 | (defalias 'default-toplevel-value 'symbol-value)) |
| 597 | 597 | ||
| 598 | ;; ‘format-message’ is new in Emacs 25, and does not exist in XEmacs. | 598 | ;; `format-message' is new in Emacs 25, and does not exist in XEmacs. |
| 599 | ;; The substitute implementation always uses grave quoting style, for | 599 | ;; The substitute implementation always uses grave quoting style, for |
| 600 | ;; compatibility with older Emacs. | 600 | ;; compatibility with older Emacs. |
| 601 | (unless (fboundp 'format-message) | 601 | (unless (fboundp 'format-message) |
| 602 | (defalias 'format-message | 602 | (defalias 'format-message 'format)) |
| 603 | (lambda (format-string &rest args) | ||
| 604 | (let ((restyled-format-string | ||
| 605 | (let ((start (string-match "[‘’]" format-string))) | ||
| 606 | (if start | ||
| 607 | (tramp-compat-replace-regexp-in-string | ||
| 608 | "[‘’]" | ||
| 609 | (lambda (match) (if (string-equal match "‘") "`" "'")) | ||
| 610 | format-string t t nil start) | ||
| 611 | format-string)))) | ||
| 612 | (apply #'format restyled-format-string args))))) | ||
| 613 | 603 | ||
| 614 | (add-hook 'tramp-unload-hook | 604 | (add-hook 'tramp-unload-hook |
| 615 | (lambda () | 605 | (lambda () |
diff --git a/lisp/net/tramp-gvfs.el b/lisp/net/tramp-gvfs.el index d96fb3e3aa3..4dfdcd76e66 100644 --- a/lisp/net/tramp-gvfs.el +++ b/lisp/net/tramp-gvfs.el | |||
| @@ -494,7 +494,7 @@ Operations not mentioned here will be handled by the default Emacs primitives.") | |||
| 494 | First arg specifies the OPERATION, second arg is a list of arguments to | 494 | First arg specifies the OPERATION, second arg is a list of arguments to |
| 495 | pass to the OPERATION." | 495 | pass to the OPERATION." |
| 496 | (unless tramp-gvfs-enabled | 496 | (unless tramp-gvfs-enabled |
| 497 | (tramp-user-error nil "Package ‘tramp-gvfs’ not supported")) | 497 | (tramp-user-error nil "Package `tramp-gvfs' not supported")) |
| 498 | (let ((fn (assoc operation tramp-gvfs-file-name-handler-alist))) | 498 | (let ((fn (assoc operation tramp-gvfs-file-name-handler-alist))) |
| 499 | (if fn | 499 | (if fn |
| 500 | (save-match-data (apply (cdr fn) args)) | 500 | (save-match-data (apply (cdr fn) args)) |
| @@ -600,7 +600,7 @@ This function is invoked by `tramp-gvfs-handle-copy-file' and | |||
| 600 | of `copy' and `rename'. FILENAME and NEWNAME must be absolute | 600 | of `copy' and `rename'. FILENAME and NEWNAME must be absolute |
| 601 | file names." | 601 | file names." |
| 602 | (unless (memq op '(copy rename)) | 602 | (unless (memq op '(copy rename)) |
| 603 | (error "Unknown operation ‘%s’, must be ‘copy’ or ‘rename’" op)) | 603 | (error "Unknown operation `%s', must be `copy' or `rename'" op)) |
| 604 | 604 | ||
| 605 | (let ((t1 (tramp-tramp-file-p filename)) | 605 | (let ((t1 (tramp-tramp-file-p filename)) |
| 606 | (t2 (tramp-tramp-file-p newname)) | 606 | (t2 (tramp-tramp-file-p newname)) |
| @@ -657,7 +657,7 @@ file names." | |||
| 657 | (goto-char (point-min)) | 657 | (goto-char (point-min)) |
| 658 | (tramp-error-with-buffer | 658 | (tramp-error-with-buffer |
| 659 | nil v 'file-error | 659 | nil v 'file-error |
| 660 | "%s failed, see buffer ‘%s’ for details." | 660 | "%s failed, see buffer `%s' for details." |
| 661 | msg-operation (buffer-name))) | 661 | msg-operation (buffer-name))) |
| 662 | 662 | ||
| 663 | ;; Some WebDAV server, like the one from QNAP, do not | 663 | ;; Some WebDAV server, like the one from QNAP, do not |
| @@ -724,7 +724,7 @@ file names." | |||
| 724 | (with-current-buffer (tramp-get-connection-buffer v) | 724 | (with-current-buffer (tramp-get-connection-buffer v) |
| 725 | (goto-char (point-min)) | 725 | (goto-char (point-min)) |
| 726 | (tramp-error-with-buffer | 726 | (tramp-error-with-buffer |
| 727 | nil v 'file-error "Couldn’t delete %s" directory))))) | 727 | nil v 'file-error "Couldn't delete %s" directory))))) |
| 728 | 728 | ||
| 729 | (defun tramp-gvfs-handle-delete-file (filename &optional trash) | 729 | (defun tramp-gvfs-handle-delete-file (filename &optional trash) |
| 730 | "Like `delete-file' for Tramp files." | 730 | "Like `delete-file' for Tramp files." |
| @@ -739,7 +739,7 @@ file names." | |||
| 739 | (with-current-buffer (tramp-get-connection-buffer v) | 739 | (with-current-buffer (tramp-get-connection-buffer v) |
| 740 | (goto-char (point-min)) | 740 | (goto-char (point-min)) |
| 741 | (tramp-error-with-buffer | 741 | (tramp-error-with-buffer |
| 742 | nil v 'file-error "Couldn’t delete %s" filename))))) | 742 | nil v 'file-error "Couldn't delete %s" filename))))) |
| 743 | 743 | ||
| 744 | (defun tramp-gvfs-handle-expand-file-name (name &optional dir) | 744 | (defun tramp-gvfs-handle-expand-file-name (name &optional dir) |
| 745 | "Like `expand-file-name' for Tramp files." | 745 | "Like `expand-file-name' for Tramp files." |
| @@ -765,7 +765,7 @@ file names." | |||
| 765 | (when (string-match "\\`\\(~[^/]*\\)\\(.*\\)\\'" localname) | 765 | (when (string-match "\\`\\(~[^/]*\\)\\(.*\\)\\'" localname) |
| 766 | (tramp-error | 766 | (tramp-error |
| 767 | v 'file-error | 767 | v 'file-error |
| 768 | "Cannot expand tilde in file ‘%s’" name)) | 768 | "Cannot expand tilde in file `%s'" name)) |
| 769 | (unless (tramp-run-real-handler 'file-name-absolute-p (list localname)) | 769 | (unless (tramp-run-real-handler 'file-name-absolute-p (list localname)) |
| 770 | (setq localname (concat "/" localname))) | 770 | (setq localname (concat "/" localname))) |
| 771 | ;; We do not pass "/..". | 771 | ;; We do not pass "/..". |
| @@ -927,7 +927,7 @@ file names." | |||
| 927 | (unless (file-exists-p filename) | 927 | (unless (file-exists-p filename) |
| 928 | (tramp-error | 928 | (tramp-error |
| 929 | v 'file-error | 929 | v 'file-error |
| 930 | "Cannot make local copy of non-existing file ‘%s’" filename)) | 930 | "Cannot make local copy of non-existing file `%s'" filename)) |
| 931 | (copy-file filename tmpfile t t) | 931 | (copy-file filename tmpfile t t) |
| 932 | tmpfile))) | 932 | tmpfile))) |
| 933 | 933 | ||
| @@ -1013,7 +1013,7 @@ file names." | |||
| 1013 | (tramp-error | 1013 | (tramp-error |
| 1014 | v 'file-notify-error "gvfs-monitor-file failed to start") | 1014 | v 'file-notify-error "gvfs-monitor-file failed to start") |
| 1015 | (tramp-message | 1015 | (tramp-message |
| 1016 | v 6 "Run ‘%s’, %S" (mapconcat 'identity (process-command p) " ") p) | 1016 | v 6 "Run `%s', %S" (mapconcat 'identity (process-command p) " ") p) |
| 1017 | (tramp-set-connection-property p "vector" v) | 1017 | (tramp-set-connection-property p "vector" v) |
| 1018 | (tramp-compat-set-process-query-on-exit-flag p nil) | 1018 | (tramp-compat-set-process-query-on-exit-flag p nil) |
| 1019 | (set-process-filter p 'tramp-gvfs-file-gvfs-monitor-file-process-filter) | 1019 | (set-process-filter p 'tramp-gvfs-file-gvfs-monitor-file-process-filter) |
| @@ -1094,7 +1094,7 @@ file names." | |||
| 1094 | ;; Just do it. | 1094 | ;; Just do it. |
| 1095 | (unless (tramp-gvfs-send-command | 1095 | (unless (tramp-gvfs-send-command |
| 1096 | v "gvfs-mkdir" (tramp-gvfs-url-file-name dir)) | 1096 | v "gvfs-mkdir" (tramp-gvfs-url-file-name dir)) |
| 1097 | (tramp-error v 'file-error "Couldn’t make directory %s" dir)))))) | 1097 | (tramp-error v 'file-error "Couldn't make directory %s" dir)))))) |
| 1098 | 1098 | ||
| 1099 | (defun tramp-gvfs-handle-rename-file | 1099 | (defun tramp-gvfs-handle-rename-file |
| 1100 | (filename newname &optional ok-if-already-exists) | 1100 | (filename newname &optional ok-if-already-exists) |
| @@ -1136,7 +1136,7 @@ file names." | |||
| 1136 | (error | 1136 | (error |
| 1137 | (delete-file tmpfile) | 1137 | (delete-file tmpfile) |
| 1138 | (tramp-error | 1138 | (tramp-error |
| 1139 | v 'file-error "Couldn’t write region to ‘%s’" filename)))) | 1139 | v 'file-error "Couldn't write region to `%s'" filename)))) |
| 1140 | 1140 | ||
| 1141 | (tramp-flush-file-property v (file-name-directory localname)) | 1141 | (tramp-flush-file-property v (file-name-directory localname)) |
| 1142 | (tramp-flush-file-property v localname) | 1142 | (tramp-flush-file-property v localname) |
| @@ -1175,7 +1175,7 @@ file names." | |||
| 1175 | (url-hexify-string (file-truename filename)) nil nil t)))) | 1175 | (url-hexify-string (file-truename filename)) nil nil t)))) |
| 1176 | (when (tramp-tramp-file-p filename) | 1176 | (when (tramp-tramp-file-p filename) |
| 1177 | (with-parsed-tramp-file-name filename nil | 1177 | (with-parsed-tramp-file-name filename nil |
| 1178 | (tramp-message v 10 "remote file ‘%s’ is URL ‘%s’" filename result))) | 1178 | (tramp-message v 10 "remote file `%s' is URL `%s'" filename result))) |
| 1179 | result)) | 1179 | result)) |
| 1180 | 1180 | ||
| 1181 | (defun tramp-gvfs-object-path (filename) | 1181 | (defun tramp-gvfs-object-path (filename) |
diff --git a/lisp/net/tramp-gw.el b/lisp/net/tramp-gw.el index 8f1909ae578..5e22f6a3b59 100644 --- a/lisp/net/tramp-gw.el +++ b/lisp/net/tramp-gw.el | |||
| @@ -95,7 +95,7 @@ | |||
| 95 | "Delete auxiliary process when we are deleted." | 95 | "Delete auxiliary process when we are deleted." |
| 96 | (unless (memq (process-status proc) '(run open)) | 96 | (unless (memq (process-status proc) '(run open)) |
| 97 | (tramp-message | 97 | (tramp-message |
| 98 | tramp-gw-vector 4 "Deleting auxiliary process ‘%s’" tramp-gw-gw-proc) | 98 | tramp-gw-vector 4 "Deleting auxiliary process `%s'" tramp-gw-gw-proc) |
| 99 | (let* ((tramp-verbose 0) | 99 | (let* ((tramp-verbose 0) |
| 100 | (p (tramp-get-connection-property proc "process" nil))) | 100 | (p (tramp-get-connection-property proc "process" nil))) |
| 101 | (when (processp p) (delete-process p))))) | 101 | (when (processp p) (delete-process p))))) |
| @@ -106,7 +106,7 @@ | |||
| 106 | ;; A new process has been spawned from `tramp-gw-aux-proc'. | 106 | ;; A new process has been spawned from `tramp-gw-aux-proc'. |
| 107 | (tramp-message | 107 | (tramp-message |
| 108 | tramp-gw-vector 4 | 108 | tramp-gw-vector 4 |
| 109 | "Opening auxiliary process ‘%s’, speaking with process ‘%s’" | 109 | "Opening auxiliary process `%s', speaking with process `%s'" |
| 110 | proc tramp-gw-gw-proc) | 110 | proc tramp-gw-gw-proc) |
| 111 | (tramp-compat-set-process-query-on-exit-flag proc nil) | 111 | (tramp-compat-set-process-query-on-exit-flag proc nil) |
| 112 | ;; We don't want debug messages, because the corresponding debug | 112 | ;; We don't want debug messages, because the corresponding debug |
| @@ -160,7 +160,7 @@ instead of the host name declared in TARGET-VEC." | |||
| 160 | (set-process-sentinel tramp-gw-aux-proc 'tramp-gw-aux-proc-sentinel) | 160 | (set-process-sentinel tramp-gw-aux-proc 'tramp-gw-aux-proc-sentinel) |
| 161 | (tramp-compat-set-process-query-on-exit-flag tramp-gw-aux-proc nil) | 161 | (tramp-compat-set-process-query-on-exit-flag tramp-gw-aux-proc nil) |
| 162 | (tramp-message | 162 | (tramp-message |
| 163 | vec 4 "Opening auxiliary process ‘%s’, listening on port %d" | 163 | vec 4 "Opening auxiliary process `%s', listening on port %d" |
| 164 | tramp-gw-aux-proc (process-contact tramp-gw-aux-proc :service)))) | 164 | tramp-gw-aux-proc (process-contact tramp-gw-aux-proc :service)))) |
| 165 | 165 | ||
| 166 | (let* ((gw-method | 166 | (let* ((gw-method |
| @@ -206,7 +206,7 @@ instead of the host name declared in TARGET-VEC." | |||
| 206 | (set-process-coding-system tramp-gw-gw-proc 'binary 'binary) | 206 | (set-process-coding-system tramp-gw-gw-proc 'binary 'binary) |
| 207 | (tramp-compat-set-process-query-on-exit-flag tramp-gw-gw-proc nil) | 207 | (tramp-compat-set-process-query-on-exit-flag tramp-gw-gw-proc nil) |
| 208 | (tramp-message | 208 | (tramp-message |
| 209 | vec 4 "Opened %s process ‘%s’" | 209 | vec 4 "Opened %s process `%s'" |
| 210 | (case gw-method ('tunnel "HTTP tunnel") ('socks "SOCKS")) | 210 | (case gw-method ('tunnel "HTTP tunnel") ('socks "SOCKS")) |
| 211 | tramp-gw-gw-proc) | 211 | tramp-gw-gw-proc) |
| 212 | 212 | ||
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index 9bd22d27d5d..c5ffb26b551 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el | |||
| @@ -97,7 +97,7 @@ e.g. \"$HOME/.sh_history\"." | |||
| 97 | "///%s#$" | 97 | "///%s#$" |
| 98 | (md5 (concat (prin1-to-string process-environment) (current-time-string)))) | 98 | (md5 (concat (prin1-to-string process-environment) (current-time-string)))) |
| 99 | "String used to recognize end of output. | 99 | "String used to recognize end of output. |
| 100 | The ‘$’ character at the end is quoted; the string cannot be | 100 | The `$' character at the end is quoted; the string cannot be |
| 101 | detected as prompt when being sent on echoing hosts, therefore.") | 101 | detected as prompt when being sent on echoing hosts, therefore.") |
| 102 | 102 | ||
| 103 | ;;;###tramp-autoload | 103 | ;;;###tramp-autoload |
| @@ -1112,7 +1112,7 @@ target of the symlink differ." | |||
| 1112 | method user host | 1112 | method user host |
| 1113 | (with-tramp-file-property v localname "file-truename" | 1113 | (with-tramp-file-property v localname "file-truename" |
| 1114 | (let ((result nil)) ; result steps in reverse order | 1114 | (let ((result nil)) ; result steps in reverse order |
| 1115 | (tramp-message v 4 "Finding true name for ‘%s’" filename) | 1115 | (tramp-message v 4 "Finding true name for `%s'" filename) |
| 1116 | (cond | 1116 | (cond |
| 1117 | ;; Use GNU readlink --canonicalize-missing where available. | 1117 | ;; Use GNU readlink --canonicalize-missing where available. |
| 1118 | ((tramp-get-remote-readlink v) | 1118 | ((tramp-get-remote-readlink v) |
| @@ -1170,9 +1170,9 @@ target of the symlink differ." | |||
| 1170 | (list thisstep)) | 1170 | (list thisstep)) |
| 1171 | "/"))))) | 1171 | "/"))))) |
| 1172 | (cond ((string= "." thisstep) | 1172 | (cond ((string= "." thisstep) |
| 1173 | (tramp-message v 5 "Ignoring step ‘.’")) | 1173 | (tramp-message v 5 "Ignoring step `.'")) |
| 1174 | ((string= ".." thisstep) | 1174 | ((string= ".." thisstep) |
| 1175 | (tramp-message v 5 "Processing step ‘..’") | 1175 | (tramp-message v 5 "Processing step `..'") |
| 1176 | (pop result)) | 1176 | (pop result)) |
| 1177 | ((stringp symlink-target) | 1177 | ((stringp symlink-target) |
| 1178 | ;; It's a symlink, follow it. | 1178 | ;; It's a symlink, follow it. |
| @@ -1188,7 +1188,7 @@ target of the symlink differ." | |||
| 1188 | (unless (tramp-equal-remote filename symlink-target) | 1188 | (unless (tramp-equal-remote filename symlink-target) |
| 1189 | (tramp-error | 1189 | (tramp-error |
| 1190 | v 'file-error | 1190 | v 'file-error |
| 1191 | "Symlink target ‘%s’ on wrong host" | 1191 | "Symlink target `%s' on wrong host" |
| 1192 | symlink-target)) | 1192 | symlink-target)) |
| 1193 | (setq symlink-target localname)) | 1193 | (setq symlink-target localname)) |
| 1194 | (setq steps | 1194 | (setq steps |
| @@ -1213,7 +1213,7 @@ target of the symlink differ." | |||
| 1213 | (not (string= (substring result -1) "/")))) | 1213 | (not (string= (substring result -1) "/")))) |
| 1214 | (setq result (concat result "/")))))) | 1214 | (setq result (concat result "/")))))) |
| 1215 | 1215 | ||
| 1216 | (tramp-message v 4 "True name of ‘%s’ is ‘%s’" localname result) | 1216 | (tramp-message v 4 "True name of `%s' is `%s'" localname result) |
| 1217 | result)))) | 1217 | result)))) |
| 1218 | 1218 | ||
| 1219 | ;; Preserve trailing "/". | 1219 | ;; Preserve trailing "/". |
| @@ -1399,7 +1399,7 @@ target of the symlink differ." | |||
| 1399 | (defun tramp-sh-handle-set-visited-file-modtime (&optional time-list) | 1399 | (defun tramp-sh-handle-set-visited-file-modtime (&optional time-list) |
| 1400 | "Like `set-visited-file-modtime' for Tramp files." | 1400 | "Like `set-visited-file-modtime' for Tramp files." |
| 1401 | (unless (buffer-file-name) | 1401 | (unless (buffer-file-name) |
| 1402 | (error "Can’t set-visited-file-modtime: buffer ‘%s’ not visiting a file" | 1402 | (error "Can't set-visited-file-modtime: buffer `%s' not visiting a file" |
| 1403 | (buffer-name))) | 1403 | (buffer-name))) |
| 1404 | (if time-list | 1404 | (if time-list |
| 1405 | (tramp-run-real-handler 'set-visited-file-modtime (list time-list)) | 1405 | (tramp-run-real-handler 'set-visited-file-modtime (list time-list)) |
| @@ -1493,7 +1493,7 @@ of." | |||
| 1493 | (format "chmod %s %s" | 1493 | (format "chmod %s %s" |
| 1494 | (tramp-compat-decimal-to-octal mode) | 1494 | (tramp-compat-decimal-to-octal mode) |
| 1495 | (tramp-shell-quote-argument localname)) | 1495 | (tramp-shell-quote-argument localname)) |
| 1496 | "Error while changing file’s mode %s" filename))) | 1496 | "Error while changing file's mode %s" filename))) |
| 1497 | 1497 | ||
| 1498 | (defun tramp-sh-handle-set-file-times (filename &optional time) | 1498 | (defun tramp-sh-handle-set-file-times (filename &optional time) |
| 1499 | "Like `set-file-times' for Tramp files." | 1499 | "Like `set-file-times' for Tramp files." |
| @@ -1967,7 +1967,7 @@ be non-negative integers." | |||
| 1967 | (tramp-error | 1967 | (tramp-error |
| 1968 | v 'file-error | 1968 | v 'file-error |
| 1969 | "\ | 1969 | "\ |
| 1970 | tramp-sh-handle-file-name-all-completions: internal error accessing ‘%s’: ‘%s’" | 1970 | tramp-sh-handle-file-name-all-completions: internal error accessing `%s': `%s'" |
| 1971 | (tramp-shell-quote-argument localname) (buffer-string)))) | 1971 | (tramp-shell-quote-argument localname) (buffer-string)))) |
| 1972 | 1972 | ||
| 1973 | (while (zerop (forward-line -1)) | 1973 | (while (zerop (forward-line -1)) |
| @@ -2020,7 +2020,7 @@ tramp-sh-handle-file-name-all-completions: internal error accessing ‘%s’: †| |||
| 2020 | (format "%s %s %s" ln | 2020 | (format "%s %s %s" ln |
| 2021 | (tramp-shell-quote-argument v1-localname) | 2021 | (tramp-shell-quote-argument v1-localname) |
| 2022 | (tramp-shell-quote-argument v2-localname)) | 2022 | (tramp-shell-quote-argument v2-localname)) |
| 2023 | "error with add-name-to-file, see buffer ‘%s’ for details" | 2023 | "error with add-name-to-file, see buffer `%s' for details" |
| 2024 | (buffer-name)))))) | 2024 | (buffer-name)))))) |
| 2025 | 2025 | ||
| 2026 | (defun tramp-sh-handle-copy-file | 2026 | (defun tramp-sh-handle-copy-file |
| @@ -2125,7 +2125,7 @@ This function is invoked by `tramp-sh-handle-copy-file' and | |||
| 2125 | of `copy' and `rename'. FILENAME and NEWNAME must be absolute | 2125 | of `copy' and `rename'. FILENAME and NEWNAME must be absolute |
| 2126 | file names." | 2126 | file names." |
| 2127 | (unless (memq op '(copy rename)) | 2127 | (unless (memq op '(copy rename)) |
| 2128 | (error "Unknown operation ‘%s’, must be ‘copy’ or ‘rename’" op)) | 2128 | (error "Unknown operation `%s', must be `copy' or `rename'" op)) |
| 2129 | (let ((t1 (tramp-tramp-file-p filename)) | 2129 | (let ((t1 (tramp-tramp-file-p filename)) |
| 2130 | (t2 (tramp-tramp-file-p newname)) | 2130 | (t2 (tramp-tramp-file-p newname)) |
| 2131 | (length (nth 7 (file-attributes (file-truename filename)))) | 2131 | (length (nth 7 (file-attributes (file-truename filename)))) |
| @@ -2265,7 +2265,7 @@ the uid and gid from FILENAME." | |||
| 2265 | ((eq op 'rename) "mv -f") | 2265 | ((eq op 'rename) "mv -f") |
| 2266 | (t (tramp-error | 2266 | (t (tramp-error |
| 2267 | v 'file-error | 2267 | v 'file-error |
| 2268 | "Unknown operation ‘%s’, must be ‘copy’ or ‘rename’" | 2268 | "Unknown operation `%s', must be `copy' or `rename'" |
| 2269 | op)))) | 2269 | op)))) |
| 2270 | (localname1 | 2270 | (localname1 |
| 2271 | (if t1 | 2271 | (if t1 |
| @@ -2297,7 +2297,7 @@ the uid and gid from FILENAME." | |||
| 2297 | cmd-result) | 2297 | cmd-result) |
| 2298 | (tramp-error-with-buffer | 2298 | (tramp-error-with-buffer |
| 2299 | nil v 'file-error | 2299 | nil v 'file-error |
| 2300 | "Copying directly failed, see buffer ‘%s’ for details." | 2300 | "Copying directly failed, see buffer `%s' for details." |
| 2301 | (buffer-name))))) | 2301 | (buffer-name))))) |
| 2302 | 2302 | ||
| 2303 | ;; We are on the local host. | 2303 | ;; We are on the local host. |
| @@ -2350,7 +2350,7 @@ the uid and gid from FILENAME." | |||
| 2350 | "%s %s %s" cmd | 2350 | "%s %s %s" cmd |
| 2351 | (tramp-shell-quote-argument localname1) | 2351 | (tramp-shell-quote-argument localname1) |
| 2352 | (tramp-shell-quote-argument tmpfile)) | 2352 | (tramp-shell-quote-argument tmpfile)) |
| 2353 | "Copying directly failed, see buffer ‘%s’ for details." | 2353 | "Copying directly failed, see buffer `%s' for details." |
| 2354 | (tramp-get-buffer v)) | 2354 | (tramp-get-buffer v)) |
| 2355 | ;; We must change the ownership as remote user. | 2355 | ;; We must change the ownership as remote user. |
| 2356 | ;; Since this does not work reliable, we also | 2356 | ;; Since this does not work reliable, we also |
| @@ -2388,7 +2388,7 @@ the uid and gid from FILENAME." | |||
| 2388 | "cp -f -p %s %s" | 2388 | "cp -f -p %s %s" |
| 2389 | (tramp-shell-quote-argument tmpfile) | 2389 | (tramp-shell-quote-argument tmpfile) |
| 2390 | (tramp-shell-quote-argument localname2)) | 2390 | (tramp-shell-quote-argument localname2)) |
| 2391 | "Copying directly failed, see buffer ‘%s’ for details." | 2391 | "Copying directly failed, see buffer `%s' for details." |
| 2392 | (tramp-get-buffer v))) | 2392 | (tramp-get-buffer v))) |
| 2393 | (t1 | 2393 | (t1 |
| 2394 | (tramp-run-real-handler | 2394 | (tramp-run-real-handler |
| @@ -2559,7 +2559,7 @@ The method used must be an out-of-band method." | |||
| 2559 | (with-timeout | 2559 | (with-timeout |
| 2560 | (60 (tramp-error | 2560 | (60 (tramp-error |
| 2561 | v 'file-error | 2561 | v 'file-error |
| 2562 | "Listener process not running on remote host: ‘%s’" | 2562 | "Listener process not running on remote host: `%s'" |
| 2563 | remote-copy-program)) | 2563 | remote-copy-program)) |
| 2564 | (tramp-send-command v (format "netstat -l | grep -q :%s" listener)) | 2564 | (tramp-send-command v (format "netstat -l | grep -q :%s" listener)) |
| 2565 | (while (not (tramp-send-command-and-check v nil)) | 2565 | (while (not (tramp-send-command-and-check v nil)) |
| @@ -2619,14 +2619,14 @@ The method used must be an out-of-band method." | |||
| 2619 | (re-search-backward "tramp_exit_status [0-9]+" nil t) | 2619 | (re-search-backward "tramp_exit_status [0-9]+" nil t) |
| 2620 | (tramp-error | 2620 | (tramp-error |
| 2621 | orig-vec 'file-error | 2621 | orig-vec 'file-error |
| 2622 | "Couldn’t find exit status of ‘%s’" | 2622 | "Couldn't find exit status of `%s'" |
| 2623 | (mapconcat 'identity (process-command p) " "))) | 2623 | (mapconcat 'identity (process-command p) " "))) |
| 2624 | (skip-chars-forward "^ ") | 2624 | (skip-chars-forward "^ ") |
| 2625 | (unless (zerop (read (current-buffer))) | 2625 | (unless (zerop (read (current-buffer))) |
| 2626 | (forward-line -1) | 2626 | (forward-line -1) |
| 2627 | (tramp-error | 2627 | (tramp-error |
| 2628 | orig-vec 'file-error | 2628 | orig-vec 'file-error |
| 2629 | "Error copying: ‘%s’" | 2629 | "Error copying: `%s'" |
| 2630 | (buffer-substring (point-min) (point-at-eol)))))) | 2630 | (buffer-substring (point-min) (point-at-eol)))))) |
| 2631 | 2631 | ||
| 2632 | ;; Reset the transfer process properties. | 2632 | ;; Reset the transfer process properties. |
| @@ -2665,7 +2665,7 @@ The method used must be an out-of-band method." | |||
| 2665 | v (format "%s %s" | 2665 | v (format "%s %s" |
| 2666 | (if parents "mkdir -p" "mkdir") | 2666 | (if parents "mkdir -p" "mkdir") |
| 2667 | (tramp-shell-quote-argument localname)) | 2667 | (tramp-shell-quote-argument localname)) |
| 2668 | "Couldn’t make directory %s" dir)))) | 2668 | "Couldn't make directory %s" dir)))) |
| 2669 | 2669 | ||
| 2670 | (defun tramp-sh-handle-delete-directory (directory &optional recursive) | 2670 | (defun tramp-sh-handle-delete-directory (directory &optional recursive) |
| 2671 | "Like `delete-directory' for Tramp files." | 2671 | "Like `delete-directory' for Tramp files." |
| @@ -2677,7 +2677,7 @@ The method used must be an out-of-band method." | |||
| 2677 | v (format "cd / && %s %s" | 2677 | v (format "cd / && %s %s" |
| 2678 | (if recursive "rm -rf" "rmdir") | 2678 | (if recursive "rm -rf" "rmdir") |
| 2679 | (tramp-shell-quote-argument localname)) | 2679 | (tramp-shell-quote-argument localname)) |
| 2680 | "Couldn’t delete %s" directory))) | 2680 | "Couldn't delete %s" directory))) |
| 2681 | 2681 | ||
| 2682 | (defun tramp-sh-handle-delete-file (filename &optional trash) | 2682 | (defun tramp-sh-handle-delete-file (filename &optional trash) |
| 2683 | "Like `delete-file' for Tramp files." | 2683 | "Like `delete-file' for Tramp files." |
| @@ -2689,7 +2689,7 @@ The method used must be an out-of-band method." | |||
| 2689 | v (format "%s %s" | 2689 | v (format "%s %s" |
| 2690 | (or (and trash (tramp-get-remote-trash v)) "rm -f") | 2690 | (or (and trash (tramp-get-remote-trash v)) "rm -f") |
| 2691 | (tramp-shell-quote-argument localname)) | 2691 | (tramp-shell-quote-argument localname)) |
| 2692 | "Couldn’t delete %s" filename))) | 2692 | "Couldn't delete %s" filename))) |
| 2693 | 2693 | ||
| 2694 | ;; Dired. | 2694 | ;; Dired. |
| 2695 | 2695 | ||
| @@ -2800,7 +2800,7 @@ This is like `dired-recursive-delete-directory' for Tramp files." | |||
| 2800 | (when wildcard | 2800 | (when wildcard |
| 2801 | (setq switches (concat switches " " wildcard))) | 2801 | (setq switches (concat switches " " wildcard))) |
| 2802 | (tramp-message | 2802 | (tramp-message |
| 2803 | v 4 "Inserting directory ‘ls %s %s’, wildcard %s, fulldir %s" | 2803 | v 4 "Inserting directory `ls %s %s', wildcard %s, fulldir %s" |
| 2804 | switches filename (if wildcard "yes" "no") | 2804 | switches filename (if wildcard "yes" "no") |
| 2805 | (if full-directory-p "yes" "no")) | 2805 | (if full-directory-p "yes" "no")) |
| 2806 | ;; If `full-directory-p', we just say `ls -l FILENAME'. | 2806 | ;; If `full-directory-p', we just say `ls -l FILENAME'. |
| @@ -2819,7 +2819,7 @@ This is like `dired-recursive-delete-directory' for Tramp files." | |||
| 2819 | (format "cd %s" (tramp-shell-quote-argument | 2819 | (format "cd %s" (tramp-shell-quote-argument |
| 2820 | (tramp-run-real-handler | 2820 | (tramp-run-real-handler |
| 2821 | 'file-name-directory (list localname)))) | 2821 | 'file-name-directory (list localname)))) |
| 2822 | "Couldn’t ‘cd %s’" | 2822 | "Couldn't `cd %s'" |
| 2823 | (tramp-shell-quote-argument | 2823 | (tramp-shell-quote-argument |
| 2824 | (tramp-run-real-handler 'file-name-directory (list localname)))) | 2824 | (tramp-run-real-handler 'file-name-directory (list localname)))) |
| 2825 | (tramp-send-command | 2825 | (tramp-send-command |
| @@ -2963,7 +2963,7 @@ the result will be a local, non-Tramp, file name." | |||
| 2963 | (unless (memq (process-status proc) '(run open)) | 2963 | (unless (memq (process-status proc) '(run open)) |
| 2964 | (let ((vec (tramp-get-connection-property proc "vector" nil))) | 2964 | (let ((vec (tramp-get-connection-property proc "vector" nil))) |
| 2965 | (when vec | 2965 | (when vec |
| 2966 | (tramp-message vec 5 "Sentinel called: ‘%S’ ‘%s’" proc event) | 2966 | (tramp-message vec 5 "Sentinel called: `%S' `%s'" proc event) |
| 2967 | (tramp-flush-connection-property proc) | 2967 | (tramp-flush-connection-property proc) |
| 2968 | (tramp-flush-directory-property vec ""))))) | 2968 | (tramp-flush-directory-property vec ""))))) |
| 2969 | 2969 | ||
| @@ -3074,7 +3074,7 @@ the result will be a local, non-Tramp, file name." | |||
| 3074 | (tramp-get-connection-process v) 'remote-tty) | 3074 | (tramp-get-connection-process v) 'remote-tty) |
| 3075 | (tramp-error | 3075 | (tramp-error |
| 3076 | v 'file-error | 3076 | v 'file-error |
| 3077 | "pty association is not supported for ‘%s’" name)))) | 3077 | "pty association is not supported for `%s'" name)))) |
| 3078 | (let ((p (tramp-get-connection-process v))) | 3078 | (let ((p (tramp-get-connection-process v))) |
| 3079 | ;; Set query flag and process marker for this | 3079 | ;; Set query flag and process marker for this |
| 3080 | ;; process. We ignore errors, because the process | 3080 | ;; process. We ignore errors, because the process |
| @@ -3223,7 +3223,7 @@ the result will be a local, non-Tramp, file name." | |||
| 3223 | (unless (file-exists-p filename) | 3223 | (unless (file-exists-p filename) |
| 3224 | (tramp-error | 3224 | (tramp-error |
| 3225 | v 'file-error | 3225 | v 'file-error |
| 3226 | "Cannot make local copy of non-existing file ‘%s’" filename)) | 3226 | "Cannot make local copy of non-existing file `%s'" filename)) |
| 3227 | 3227 | ||
| 3228 | (let* ((size (nth 7 (file-attributes (file-truename filename)))) | 3228 | (let* ((size (nth 7 (file-attributes (file-truename filename)))) |
| 3229 | (rem-enc (tramp-get-inline-coding v "remote-encoding" size)) | 3229 | (rem-enc (tramp-get-inline-coding v "remote-encoding" size)) |
| @@ -3242,14 +3242,14 @@ the result will be a local, non-Tramp, file name." | |||
| 3242 | (save-excursion | 3242 | (save-excursion |
| 3243 | (with-tramp-progress-reporter | 3243 | (with-tramp-progress-reporter |
| 3244 | v 3 | 3244 | v 3 |
| 3245 | (format-message "Encoding remote file ‘%s’ with ‘%s’" | 3245 | (format-message "Encoding remote file `%s' with `%s'" |
| 3246 | filename rem-enc) | 3246 | filename rem-enc) |
| 3247 | (tramp-barf-unless-okay | 3247 | (tramp-barf-unless-okay |
| 3248 | v (format rem-enc (tramp-shell-quote-argument localname)) | 3248 | v (format rem-enc (tramp-shell-quote-argument localname)) |
| 3249 | "Encoding remote file failed")) | 3249 | "Encoding remote file failed")) |
| 3250 | 3250 | ||
| 3251 | (with-tramp-progress-reporter | 3251 | (with-tramp-progress-reporter |
| 3252 | v 3 (format-message "Decoding local file ‘%s’ with ‘%s’" | 3252 | v 3 (format-message "Decoding local file `%s' with `%s'" |
| 3253 | tmpfile loc-dec) | 3253 | tmpfile loc-dec) |
| 3254 | (if (functionp loc-dec) | 3254 | (if (functionp loc-dec) |
| 3255 | ;; If local decoding is a function, we call it. | 3255 | ;; If local decoding is a function, we call it. |
| @@ -3286,7 +3286,7 @@ the result will be a local, non-Tramp, file name." | |||
| 3286 | 3286 | ||
| 3287 | ;; Oops, I don't know what to do. | 3287 | ;; Oops, I don't know what to do. |
| 3288 | (t (tramp-error | 3288 | (t (tramp-error |
| 3289 | v 'file-error "Wrong method specification for ‘%s’" method))) | 3289 | v 'file-error "Wrong method specification for `%s'" method))) |
| 3290 | 3290 | ||
| 3291 | ;; Error handling. | 3291 | ;; Error handling. |
| 3292 | ((error quit) | 3292 | ((error quit) |
| @@ -3458,7 +3458,7 @@ the result will be a local, non-Tramp, file name." | |||
| 3458 | ;; Use encoding function or command. | 3458 | ;; Use encoding function or command. |
| 3459 | (with-tramp-progress-reporter | 3459 | (with-tramp-progress-reporter |
| 3460 | v 3 (format-message | 3460 | v 3 (format-message |
| 3461 | "Encoding local file ‘%s’ using ‘%s’" | 3461 | "Encoding local file `%s' using `%s'" |
| 3462 | tmpfile loc-enc) | 3462 | tmpfile loc-enc) |
| 3463 | (if (functionp loc-enc) | 3463 | (if (functionp loc-enc) |
| 3464 | ;; The following `let' is a workaround for | 3464 | ;; The following `let' is a workaround for |
| @@ -3480,8 +3480,8 @@ the result will be a local, non-Tramp, file name." | |||
| 3480 | loc-enc tmpfile t)) | 3480 | loc-enc tmpfile t)) |
| 3481 | (tramp-error | 3481 | (tramp-error |
| 3482 | v 'file-error | 3482 | v 'file-error |
| 3483 | (concat "Cannot write to ‘%s’, " | 3483 | (concat "Cannot write to `%s', " |
| 3484 | "local encoding command ‘%s’ failed") | 3484 | "local encoding command `%s' failed") |
| 3485 | filename loc-enc)))) | 3485 | filename loc-enc)))) |
| 3486 | 3486 | ||
| 3487 | ;; Send buffer into remote decoding command which | 3487 | ;; Send buffer into remote decoding command which |
| @@ -3489,7 +3489,7 @@ the result will be a local, non-Tramp, file name." | |||
| 3489 | ;; the remote host, we cannot use the function. | 3489 | ;; the remote host, we cannot use the function. |
| 3490 | (with-tramp-progress-reporter | 3490 | (with-tramp-progress-reporter |
| 3491 | v 3 (format-message | 3491 | v 3 (format-message |
| 3492 | "Decoding remote file ‘%s’ using ‘%s’" | 3492 | "Decoding remote file `%s' using `%s'" |
| 3493 | filename rem-dec) | 3493 | filename rem-dec) |
| 3494 | (goto-char (point-max)) | 3494 | (goto-char (point-max)) |
| 3495 | (unless (bolp) (newline)) | 3495 | (unless (bolp) (newline)) |
| @@ -3503,7 +3503,7 @@ the result will be a local, non-Tramp, file name." | |||
| 3503 | tramp-end-of-heredoc)) | 3503 | tramp-end-of-heredoc)) |
| 3504 | (tramp-barf-unless-okay | 3504 | (tramp-barf-unless-okay |
| 3505 | v nil | 3505 | v nil |
| 3506 | "Couldn’t write region to ‘%s’, decode using ‘%s’ failed" | 3506 | "Couldn't write region to `%s', decode using `%s' failed" |
| 3507 | filename rem-dec) | 3507 | filename rem-dec) |
| 3508 | ;; When `file-precious-flag' is set, the region is | 3508 | ;; When `file-precious-flag' is set, the region is |
| 3509 | ;; written to a temporary file. Check that the | 3509 | ;; written to a temporary file. Check that the |
| @@ -3526,8 +3526,8 @@ the result will be a local, non-Tramp, file name." | |||
| 3526 | (buffer-string)))) | 3526 | (buffer-string)))) |
| 3527 | (tramp-error | 3527 | (tramp-error |
| 3528 | v 'file-error | 3528 | v 'file-error |
| 3529 | (concat "Couldn’t write region to ‘%s’," | 3529 | (concat "Couldn't write region to `%s'," |
| 3530 | " decode using ‘%s’ failed") | 3530 | " decode using `%s' failed") |
| 3531 | filename rem-dec))))) | 3531 | filename rem-dec))))) |
| 3532 | 3532 | ||
| 3533 | ;; Save exit. | 3533 | ;; Save exit. |
| @@ -3537,7 +3537,7 @@ the result will be a local, non-Tramp, file name." | |||
| 3537 | (t | 3537 | (t |
| 3538 | (tramp-error | 3538 | (tramp-error |
| 3539 | v 'file-error | 3539 | v 'file-error |
| 3540 | (concat "Method ‘%s’ should specify both encoding and " | 3540 | (concat "Method `%s' should specify both encoding and " |
| 3541 | "decoding command or an scp program") | 3541 | "decoding command or an scp program") |
| 3542 | method)))) | 3542 | method)))) |
| 3543 | 3543 | ||
| @@ -3591,7 +3591,7 @@ the result will be a local, non-Tramp, file name." | |||
| 3591 | (tramp-compat-with-temp-message "" | 3591 | (tramp-compat-with-temp-message "" |
| 3592 | (with-parsed-tramp-file-name file nil | 3592 | (with-parsed-tramp-file-name file nil |
| 3593 | (with-tramp-progress-reporter | 3593 | (with-tramp-progress-reporter |
| 3594 | v 3 (format-message "Checking ‘vc-registered’ for %s" file) | 3594 | v 3 (format-message "Checking `vc-registered' for %s" file) |
| 3595 | 3595 | ||
| 3596 | ;; There could be new files, created by the vc backend. We | 3596 | ;; There could be new files, created by the vc backend. We |
| 3597 | ;; cannot reuse the old cache entries, therefore. In | 3597 | ;; cannot reuse the old cache entries, therefore. In |
| @@ -3751,9 +3751,9 @@ Fall back to normal file name handler if no Tramp handler exists." | |||
| 3751 | (if (not (processp p)) | 3751 | (if (not (processp p)) |
| 3752 | (tramp-error | 3752 | (tramp-error |
| 3753 | v 'file-notify-error | 3753 | v 'file-notify-error |
| 3754 | "‘%s’ failed to start on remote host" | 3754 | "`%s' failed to start on remote host" |
| 3755 | (mapconcat 'identity sequence " ")) | 3755 | (mapconcat 'identity sequence " ")) |
| 3756 | (tramp-message v 6 "Run ‘%s’, %S" (mapconcat 'identity sequence " ") p) | 3756 | (tramp-message v 6 "Run `%s', %S" (mapconcat 'identity sequence " ") p) |
| 3757 | (tramp-set-connection-property p "vector" v) | 3757 | (tramp-set-connection-property p "vector" v) |
| 3758 | (tramp-compat-set-process-query-on-exit-flag p nil) | 3758 | (tramp-compat-set-process-query-on-exit-flag p nil) |
| 3759 | (set-process-filter p filter) | 3759 | (set-process-filter p filter) |
| @@ -3840,7 +3840,7 @@ Only send the definition if it has not already been done." | |||
| 3840 | (tramp-get-connection-process vec) "scripts" nil))) | 3840 | (tramp-get-connection-process vec) "scripts" nil))) |
| 3841 | (unless (member name scripts) | 3841 | (unless (member name scripts) |
| 3842 | (with-tramp-progress-reporter | 3842 | (with-tramp-progress-reporter |
| 3843 | vec 5 (format-message "Sending script ‘%s’" name) | 3843 | vec 5 (format-message "Sending script `%s'" name) |
| 3844 | ;; In bash, leading TABs like in `tramp-vc-registered-read-file-names' | 3844 | ;; In bash, leading TABs like in `tramp-vc-registered-read-file-names' |
| 3845 | ;; could result in unwanted command expansion. Avoid this. | 3845 | ;; could result in unwanted command expansion. Avoid this. |
| 3846 | (setq script (tramp-compat-replace-regexp-in-string | 3846 | (setq script (tramp-compat-replace-regexp-in-string |
| @@ -4008,13 +4008,13 @@ file exists and nonzero exit status otherwise." | |||
| 4008 | (not (tramp-send-command-and-check | 4008 | (not (tramp-send-command-and-check |
| 4009 | vec (format "%s %s" result nonexistent)))))) | 4009 | vec (format "%s %s" result nonexistent)))))) |
| 4010 | (tramp-error | 4010 | (tramp-error |
| 4011 | vec 'file-error "Couldn’t find command to check if file exists")) | 4011 | vec 'file-error "Couldn't find command to check if file exists")) |
| 4012 | result)) | 4012 | result)) |
| 4013 | 4013 | ||
| 4014 | (defun tramp-open-shell (vec shell) | 4014 | (defun tramp-open-shell (vec shell) |
| 4015 | "Opens shell SHELL." | 4015 | "Opens shell SHELL." |
| 4016 | (with-tramp-progress-reporter | 4016 | (with-tramp-progress-reporter |
| 4017 | vec 5 (format-message "Opening remote shell ‘%s’" shell) | 4017 | vec 5 (format-message "Opening remote shell `%s'" shell) |
| 4018 | ;; Find arguments for this shell. | 4018 | ;; Find arguments for this shell. |
| 4019 | (let ((alist tramp-sh-extra-args) | 4019 | (let ((alist tramp-sh-extra-args) |
| 4020 | item extra-args) | 4020 | item extra-args) |
| @@ -4078,8 +4078,8 @@ file exists and nonzero exit status otherwise." | |||
| 4078 | (tramp-message | 4078 | (tramp-message |
| 4079 | vec 2 | 4079 | vec 2 |
| 4080 | (concat | 4080 | (concat |
| 4081 | "Couldn’t find a remote shell which groks tilde " | 4081 | "Couldn't find a remote shell which groks tilde " |
| 4082 | "expansion, using ‘%s’") | 4082 | "expansion, using `%s'") |
| 4083 | default-shell))) | 4083 | default-shell))) |
| 4084 | 4084 | ||
| 4085 | default-shell))) | 4085 | default-shell))) |
| @@ -4087,7 +4087,7 @@ file exists and nonzero exit status otherwise." | |||
| 4087 | ;; Open a new shell if needed. | 4087 | ;; Open a new shell if needed. |
| 4088 | (unless (string-equal shell default-shell) | 4088 | (unless (string-equal shell default-shell) |
| 4089 | (tramp-message | 4089 | (tramp-message |
| 4090 | vec 5 "Starting remote shell ‘%s’ for tilde expansion" shell) | 4090 | vec 5 "Starting remote shell `%s' for tilde expansion" shell) |
| 4091 | (tramp-open-shell vec shell))))) | 4091 | (tramp-open-shell vec shell))))) |
| 4092 | 4092 | ||
| 4093 | ;; Utility functions. | 4093 | ;; Utility functions. |
| @@ -4163,7 +4163,7 @@ process to set up. VEC specifies the connection." | |||
| 4163 | (tramp-compat-funcall | 4163 | (tramp-compat-funcall |
| 4164 | 'set-buffer-process-coding-system cs-decode cs-encode) | 4164 | 'set-buffer-process-coding-system cs-decode cs-encode) |
| 4165 | (tramp-message | 4165 | (tramp-message |
| 4166 | vec 5 "Setting coding system to ‘%s’ and ‘%s’" cs-decode cs-encode)) | 4166 | vec 5 "Setting coding system to `%s' and `%s'" cs-decode cs-encode)) |
| 4167 | ;; Look for ^M and do something useful if found. | 4167 | ;; Look for ^M and do something useful if found. |
| 4168 | (when (search-forward "\r" nil t) | 4168 | (when (search-forward "\r" nil t) |
| 4169 | ;; We have found a ^M but cannot frob the process coding system | 4169 | ;; We have found a ^M but cannot frob the process coding system |
| @@ -4186,7 +4186,7 @@ process to set up. VEC specifies the connection." | |||
| 4186 | (when (and (stringp old-uname) (not (string-equal old-uname new-uname))) | 4186 | (when (and (stringp old-uname) (not (string-equal old-uname new-uname))) |
| 4187 | (tramp-message | 4187 | (tramp-message |
| 4188 | vec 3 | 4188 | vec 3 |
| 4189 | "Connection reset, because remote host changed from ‘%s’ to ‘%s’" | 4189 | "Connection reset, because remote host changed from `%s' to `%s'" |
| 4190 | old-uname new-uname) | 4190 | old-uname new-uname) |
| 4191 | ;; We want to keep the password. | 4191 | ;; We want to keep the password. |
| 4192 | (tramp-cleanup-connection vec t t) | 4192 | (tramp-cleanup-connection vec t t) |
| @@ -4204,7 +4204,7 @@ process to set up. VEC specifies the connection." | |||
| 4204 | tramp-chunksize) | 4204 | tramp-chunksize) |
| 4205 | (t | 4205 | (t |
| 4206 | (tramp-message | 4206 | (tramp-message |
| 4207 | vec 5 "Checking remote host type for ‘send-process-string’ bug") | 4207 | vec 5 "Checking remote host type for `send-process-string' bug") |
| 4208 | (if (string-match | 4208 | (if (string-match |
| 4209 | "^FreeBSD" (tramp-get-connection-property vec "uname" "")) | 4209 | "^FreeBSD" (tramp-get-connection-property vec "uname" "")) |
| 4210 | 500 0)))) | 4210 | 500 0)))) |
| @@ -4372,17 +4372,17 @@ Goes through the list `tramp-local-coding-commands' and | |||
| 4372 | ;; corresponding command has to work locally. | 4372 | ;; corresponding command has to work locally. |
| 4373 | (if (not (stringp loc-enc)) | 4373 | (if (not (stringp loc-enc)) |
| 4374 | (tramp-message | 4374 | (tramp-message |
| 4375 | vec 5 "Checking local encoding function ‘%s’" loc-enc) | 4375 | vec 5 "Checking local encoding function `%s'" loc-enc) |
| 4376 | (tramp-message | 4376 | (tramp-message |
| 4377 | vec 5 "Checking local encoding command ‘%s’ for sanity" loc-enc) | 4377 | vec 5 "Checking local encoding command `%s' for sanity" loc-enc) |
| 4378 | (unless (zerop (tramp-call-local-coding-command | 4378 | (unless (zerop (tramp-call-local-coding-command |
| 4379 | loc-enc nil nil)) | 4379 | loc-enc nil nil)) |
| 4380 | (throw 'wont-work-local nil))) | 4380 | (throw 'wont-work-local nil))) |
| 4381 | (if (not (stringp loc-dec)) | 4381 | (if (not (stringp loc-dec)) |
| 4382 | (tramp-message | 4382 | (tramp-message |
| 4383 | vec 5 "Checking local decoding function ‘%s’" loc-dec) | 4383 | vec 5 "Checking local decoding function `%s'" loc-dec) |
| 4384 | (tramp-message | 4384 | (tramp-message |
| 4385 | vec 5 "Checking local decoding command ‘%s’ for sanity" loc-dec) | 4385 | vec 5 "Checking local decoding command `%s' for sanity" loc-dec) |
| 4386 | (unless (zerop (tramp-call-local-coding-command | 4386 | (unless (zerop (tramp-call-local-coding-command |
| 4387 | loc-dec nil nil)) | 4387 | loc-dec nil nil)) |
| 4388 | (throw 'wont-work-local nil))) | 4388 | (throw 'wont-work-local nil))) |
| @@ -4397,7 +4397,7 @@ Goes through the list `tramp-local-coding-commands' and | |||
| 4397 | ;; Check the remote test command if exists. | 4397 | ;; Check the remote test command if exists. |
| 4398 | (when (stringp rem-test) | 4398 | (when (stringp rem-test) |
| 4399 | (tramp-message | 4399 | (tramp-message |
| 4400 | vec 5 "Checking remote test command ‘%s’" rem-test) | 4400 | vec 5 "Checking remote test command `%s'" rem-test) |
| 4401 | (unless (tramp-send-command-and-check vec rem-test t) | 4401 | (unless (tramp-send-command-and-check vec rem-test t) |
| 4402 | (throw 'wont-work-remote nil))) | 4402 | (throw 'wont-work-remote nil))) |
| 4403 | ;; Check if remote perl exists when necessary. | 4403 | ;; Check if remote perl exists when necessary. |
| @@ -4421,7 +4421,7 @@ Goes through the list `tramp-local-coding-commands' and | |||
| 4421 | (setq rem-enc name))) | 4421 | (setq rem-enc name))) |
| 4422 | (tramp-message | 4422 | (tramp-message |
| 4423 | vec 5 | 4423 | vec 5 |
| 4424 | "Checking remote encoding command ‘%s’ for sanity" rem-enc) | 4424 | "Checking remote encoding command `%s' for sanity" rem-enc) |
| 4425 | (unless (tramp-send-command-and-check | 4425 | (unless (tramp-send-command-and-check |
| 4426 | vec (format "%s </dev/null" rem-enc) t) | 4426 | vec (format "%s </dev/null" rem-enc) t) |
| 4427 | (throw 'wont-work-remote nil)) | 4427 | (throw 'wont-work-remote nil)) |
| @@ -4449,7 +4449,7 @@ Goes through the list `tramp-local-coding-commands' and | |||
| 4449 | (setq rem-dec name))) | 4449 | (setq rem-dec name))) |
| 4450 | (tramp-message | 4450 | (tramp-message |
| 4451 | vec 5 | 4451 | vec 5 |
| 4452 | "Checking remote decoding command ‘%s’ for sanity" rem-dec) | 4452 | "Checking remote decoding command `%s' for sanity" rem-dec) |
| 4453 | (unless (tramp-send-command-and-check | 4453 | (unless (tramp-send-command-and-check |
| 4454 | vec | 4454 | vec |
| 4455 | (format "echo %s | %s | %s" magic rem-enc rem-dec) | 4455 | (format "echo %s | %s | %s" magic rem-enc rem-dec) |
| @@ -4469,13 +4469,13 @@ Goes through the list `tramp-local-coding-commands' and | |||
| 4469 | (when found | 4469 | (when found |
| 4470 | ;; Set connection properties. Since the commands are risky | 4470 | ;; Set connection properties. Since the commands are risky |
| 4471 | ;; (due to output direction), we cache them in the process cache. | 4471 | ;; (due to output direction), we cache them in the process cache. |
| 4472 | (tramp-message vec 5 "Using local encoding ‘%s’" loc-enc) | 4472 | (tramp-message vec 5 "Using local encoding `%s'" loc-enc) |
| 4473 | (tramp-set-connection-property p "local-encoding" loc-enc) | 4473 | (tramp-set-connection-property p "local-encoding" loc-enc) |
| 4474 | (tramp-message vec 5 "Using local decoding ‘%s’" loc-dec) | 4474 | (tramp-message vec 5 "Using local decoding `%s'" loc-dec) |
| 4475 | (tramp-set-connection-property p "local-decoding" loc-dec) | 4475 | (tramp-set-connection-property p "local-decoding" loc-dec) |
| 4476 | (tramp-message vec 5 "Using remote encoding ‘%s’" rem-enc) | 4476 | (tramp-message vec 5 "Using remote encoding `%s'" rem-enc) |
| 4477 | (tramp-set-connection-property p "remote-encoding" rem-enc) | 4477 | (tramp-set-connection-property p "remote-encoding" rem-enc) |
| 4478 | (tramp-message vec 5 "Using remote decoding ‘%s’" rem-dec) | 4478 | (tramp-message vec 5 "Using remote decoding `%s'" rem-dec) |
| 4479 | (tramp-set-connection-property p "remote-decoding" rem-dec))))) | 4479 | (tramp-set-connection-property p "remote-decoding" rem-dec))))) |
| 4480 | 4480 | ||
| 4481 | (defun tramp-call-local-coding-command (cmd input output) | 4481 | (defun tramp-call-local-coding-command (cmd input output) |
| @@ -4523,7 +4523,7 @@ Goes through the list `tramp-inline-compress-commands'." | |||
| 4523 | decompress (nth 1 item)) | 4523 | decompress (nth 1 item)) |
| 4524 | (tramp-message | 4524 | (tramp-message |
| 4525 | vec 5 | 4525 | vec 5 |
| 4526 | "Checking local compress commands ‘%s’, ‘%s’ for sanity" | 4526 | "Checking local compress commands `%s', `%s' for sanity" |
| 4527 | compress decompress) | 4527 | compress decompress) |
| 4528 | (unless | 4528 | (unless |
| 4529 | (zerop | 4529 | (zerop |
| @@ -4539,7 +4539,7 @@ Goes through the list `tramp-inline-compress-commands'." | |||
| 4539 | (throw 'next nil)) | 4539 | (throw 'next nil)) |
| 4540 | (tramp-message | 4540 | (tramp-message |
| 4541 | vec 5 | 4541 | vec 5 |
| 4542 | "Checking remote compress commands ‘%s’, ‘%s’ for sanity" | 4542 | "Checking remote compress commands `%s', `%s' for sanity" |
| 4543 | compress decompress) | 4543 | compress decompress) |
| 4544 | (unless (tramp-send-command-and-check | 4544 | (unless (tramp-send-command-and-check |
| 4545 | vec (format "echo %s | %s | %s" magic compress decompress) t) | 4545 | vec (format "echo %s | %s | %s" magic compress decompress) t) |
| @@ -4553,16 +4553,16 @@ Goes through the list `tramp-inline-compress-commands'." | |||
| 4553 | ;; risky (due to output direction), we cache them in the | 4553 | ;; risky (due to output direction), we cache them in the |
| 4554 | ;; process cache. | 4554 | ;; process cache. |
| 4555 | (tramp-message | 4555 | (tramp-message |
| 4556 | vec 5 "Using inline transfer compress command ‘%s’" compress) | 4556 | vec 5 "Using inline transfer compress command `%s'" compress) |
| 4557 | (tramp-set-connection-property p "inline-compress" compress) | 4557 | (tramp-set-connection-property p "inline-compress" compress) |
| 4558 | (tramp-message | 4558 | (tramp-message |
| 4559 | vec 5 "Using inline transfer decompress command ‘%s’" decompress) | 4559 | vec 5 "Using inline transfer decompress command `%s'" decompress) |
| 4560 | (tramp-set-connection-property p "inline-decompress" decompress)) | 4560 | (tramp-set-connection-property p "inline-decompress" decompress)) |
| 4561 | 4561 | ||
| 4562 | (tramp-set-connection-property p "inline-compress" nil) | 4562 | (tramp-set-connection-property p "inline-compress" nil) |
| 4563 | (tramp-set-connection-property p "inline-decompress" nil) | 4563 | (tramp-set-connection-property p "inline-decompress" nil) |
| 4564 | (tramp-message | 4564 | (tramp-message |
| 4565 | vec 2 "Couldn’t find an inline transfer compress command"))))) | 4565 | vec 2 "Couldn't find an inline transfer compress command"))))) |
| 4566 | 4566 | ||
| 4567 | (defun tramp-compute-multi-hops (vec) | 4567 | (defun tramp-compute-multi-hops (vec) |
| 4568 | "Expands VEC according to `tramp-default-proxies-alist'. | 4568 | "Expands VEC according to `tramp-default-proxies-alist'. |
| @@ -4635,7 +4635,7 @@ Gateway hops are already opened." | |||
| 4635 | (unless (tramp-file-name-port hop) | 4635 | (unless (tramp-file-name-port hop) |
| 4636 | (tramp-error | 4636 | (tramp-error |
| 4637 | vec 'file-error | 4637 | vec 'file-error |
| 4638 | "Connection ‘%s’ is not supported for gateway access." hop)) | 4638 | "Connection `%s' is not supported for gateway access." hop)) |
| 4639 | ;; Open the gateway connection. | 4639 | ;; Open the gateway connection. |
| 4640 | (push | 4640 | (push |
| 4641 | (vector | 4641 | (vector |
| @@ -4657,7 +4657,7 @@ Gateway hops are already opened." | |||
| 4657 | (tramp-get-method-parameter item 'tramp-copy-program)) | 4657 | (tramp-get-method-parameter item 'tramp-copy-program)) |
| 4658 | (tramp-error | 4658 | (tramp-error |
| 4659 | vec 'file-error | 4659 | vec 'file-error |
| 4660 | "Method ‘%s’ is not supported for multi-hops." | 4660 | "Method `%s' is not supported for multi-hops." |
| 4661 | (tramp-file-name-method item))))) | 4661 | (tramp-file-name-method item))))) |
| 4662 | 4662 | ||
| 4663 | ;; In case the host name is not used for the remote shell | 4663 | ;; In case the host name is not used for the remote shell |
| @@ -4677,7 +4677,7 @@ Gateway hops are already opened." | |||
| 4677 | (string-match tramp-local-host-regexp host)) | 4677 | (string-match tramp-local-host-regexp host)) |
| 4678 | (tramp-error | 4678 | (tramp-error |
| 4679 | v 'file-error | 4679 | v 'file-error |
| 4680 | "Host ‘%s’ looks like a remote host, ‘%s’ can only use the local host" | 4680 | "Host `%s' looks like a remote host, `%s' can only use the local host" |
| 4681 | host method))) | 4681 | host method))) |
| 4682 | 4682 | ||
| 4683 | ;; Result. | 4683 | ;; Result. |
| @@ -4837,7 +4837,7 @@ connection if a previous connection has died for some reason." | |||
| 4837 | ;; Check whether process is alive. | 4837 | ;; Check whether process is alive. |
| 4838 | (tramp-barf-if-no-shell-prompt | 4838 | (tramp-barf-if-no-shell-prompt |
| 4839 | p 10 | 4839 | p 10 |
| 4840 | "Couldn’t find local shell prompt for %s" tramp-encoding-shell) | 4840 | "Couldn't find local shell prompt for %s" tramp-encoding-shell) |
| 4841 | 4841 | ||
| 4842 | ;; Now do all the connections as specified. | 4842 | ;; Now do all the connections as specified. |
| 4843 | (while target-alist | 4843 | (while target-alist |
| @@ -4957,13 +4957,13 @@ connection if a previous connection has died for some reason." | |||
| 4957 | (when r-shell " && exit || exit"))) | 4957 | (when r-shell " && exit || exit"))) |
| 4958 | 4958 | ||
| 4959 | ;; Send the command. | 4959 | ;; Send the command. |
| 4960 | (tramp-message vec 3 "Sending command ‘%s’" command) | 4960 | (tramp-message vec 3 "Sending command `%s'" command) |
| 4961 | (tramp-send-command vec command t t) | 4961 | (tramp-send-command vec command t t) |
| 4962 | (tramp-process-actions | 4962 | (tramp-process-actions |
| 4963 | p vec pos tramp-actions-before-shell | 4963 | p vec pos tramp-actions-before-shell |
| 4964 | (or connection-timeout tramp-connection-timeout)) | 4964 | (or connection-timeout tramp-connection-timeout)) |
| 4965 | (tramp-message | 4965 | (tramp-message |
| 4966 | vec 3 "Found remote shell prompt on ‘%s’" l-host)) | 4966 | vec 3 "Found remote shell prompt on `%s'" l-host)) |
| 4967 | ;; Next hop. | 4967 | ;; Next hop. |
| 4968 | (setq options "" | 4968 | (setq options "" |
| 4969 | target-alist (cdr target-alist))) | 4969 | target-alist (cdr target-alist))) |
| @@ -5009,7 +5009,7 @@ function waits for output unless NOOUTPUT is set." | |||
| 5009 | "Wait for output from remote command." | 5009 | "Wait for output from remote command." |
| 5010 | (unless (buffer-live-p (process-buffer proc)) | 5010 | (unless (buffer-live-p (process-buffer proc)) |
| 5011 | (delete-process proc) | 5011 | (delete-process proc) |
| 5012 | (tramp-error proc 'file-error "Process ‘%s’ not available, try again" proc)) | 5012 | (tramp-error proc 'file-error "Process `%s' not available, try again" proc)) |
| 5013 | (with-current-buffer (process-buffer proc) | 5013 | (with-current-buffer (process-buffer proc) |
| 5014 | (let* (;; Initially, `tramp-end-of-output' is "#$ ". There might | 5014 | (let* (;; Initially, `tramp-end-of-output' is "#$ ". There might |
| 5015 | ;; be leading escape sequences, which must be ignored. | 5015 | ;; be leading escape sequences, which must be ignored. |
| @@ -5034,11 +5034,11 @@ function waits for output unless NOOUTPUT is set." | |||
| 5034 | (if timeout | 5034 | (if timeout |
| 5035 | (tramp-error | 5035 | (tramp-error |
| 5036 | proc 'file-error | 5036 | proc 'file-error |
| 5037 | "[[Remote prompt ‘%s’ not found in %d secs]]" | 5037 | "[[Remote prompt `%s' not found in %d secs]]" |
| 5038 | tramp-end-of-output timeout) | 5038 | tramp-end-of-output timeout) |
| 5039 | (tramp-error | 5039 | (tramp-error |
| 5040 | proc 'file-error | 5040 | proc 'file-error |
| 5041 | "[[Remote prompt ‘%s’ not found]]" tramp-end-of-output))) | 5041 | "[[Remote prompt `%s' not found]]" tramp-end-of-output))) |
| 5042 | ;; Return value is whether end-of-output sentinel was found. | 5042 | ;; Return value is whether end-of-output sentinel was found. |
| 5043 | found))) | 5043 | found))) |
| 5044 | 5044 | ||
| @@ -5063,7 +5063,7 @@ DONT-SUPPRESS-ERR is non-nil, stderr won't be sent to /dev/null." | |||
| 5063 | (goto-char (point-max)) | 5063 | (goto-char (point-max)) |
| 5064 | (unless (re-search-backward "tramp_exit_status [0-9]+" nil t) | 5064 | (unless (re-search-backward "tramp_exit_status [0-9]+" nil t) |
| 5065 | (tramp-error | 5065 | (tramp-error |
| 5066 | vec 'file-error "Couldn’t find exit status of ‘%s’" command)) | 5066 | vec 'file-error "Couldn't find exit status of `%s'" command)) |
| 5067 | (skip-chars-forward "^ ") | 5067 | (skip-chars-forward "^ ") |
| 5068 | (prog1 | 5068 | (prog1 |
| 5069 | (zerop (read (current-buffer))) | 5069 | (zerop (read (current-buffer))) |
| @@ -5085,7 +5085,7 @@ raises an error." | |||
| 5085 | (when (if noerror | 5085 | (when (if noerror |
| 5086 | (tramp-send-command-and-check vec command) | 5086 | (tramp-send-command-and-check vec command) |
| 5087 | (tramp-barf-unless-okay | 5087 | (tramp-barf-unless-okay |
| 5088 | vec command "‘%s’ returns with error" command)) | 5088 | vec command "`%s' returns with error" command)) |
| 5089 | (with-current-buffer (tramp-get-connection-buffer vec) | 5089 | (with-current-buffer (tramp-get-connection-buffer vec) |
| 5090 | (goto-char (point-min)) | 5090 | (goto-char (point-min)) |
| 5091 | ;; Read the marker. | 5091 | ;; Read the marker. |
| @@ -5095,7 +5095,7 @@ raises an error." | |||
| 5095 | (error (unless noerror | 5095 | (error (unless noerror |
| 5096 | (tramp-error | 5096 | (tramp-error |
| 5097 | vec 'file-error | 5097 | vec 'file-error |
| 5098 | "‘%s’ does not return the marker ‘%s’: ‘%s’" | 5098 | "`%s' does not return the marker `%s': `%s'" |
| 5099 | command marker (buffer-string)))))) | 5099 | command marker (buffer-string)))))) |
| 5100 | ;; Read the expression. | 5100 | ;; Read the expression. |
| 5101 | (condition-case nil | 5101 | (condition-case nil |
| @@ -5106,7 +5106,7 @@ raises an error." | |||
| 5106 | (error (unless noerror | 5106 | (error (unless noerror |
| 5107 | (tramp-error | 5107 | (tramp-error |
| 5108 | vec 'file-error | 5108 | vec 'file-error |
| 5109 | "‘%s’ does not return a valid Lisp expression: ‘%s’" | 5109 | "`%s' does not return a valid Lisp expression: `%s'" |
| 5110 | command (buffer-string)))))))) | 5110 | command (buffer-string)))))))) |
| 5111 | 5111 | ||
| 5112 | (defun tramp-convert-file-attributes (vec attr) | 5112 | (defun tramp-convert-file-attributes (vec attr) |
| @@ -5250,7 +5250,7 @@ Return ATTR." | |||
| 5250 | (progn | 5250 | (progn |
| 5251 | (tramp-message | 5251 | (tramp-message |
| 5252 | vec 3 | 5252 | vec 3 |
| 5253 | "‘getconf PATH’ not successful, using default value \"%s\"." | 5253 | "`getconf PATH' not successful, using default value \"%s\"." |
| 5254 | "/bin:/usr/bin") | 5254 | "/bin:/usr/bin") |
| 5255 | "/bin:/usr/bin")))) | 5255 | "/bin:/usr/bin")))) |
| 5256 | (own-remote-path | 5256 | (own-remote-path |
| @@ -5330,7 +5330,7 @@ Return ATTR." | |||
| 5330 | 5330 | ||
| 5331 | (defun tramp-get-ls-command (vec) | 5331 | (defun tramp-get-ls-command (vec) |
| 5332 | (with-tramp-connection-property vec "ls" | 5332 | (with-tramp-connection-property vec "ls" |
| 5333 | (tramp-message vec 5 "Finding a suitable ‘ls’ command") | 5333 | (tramp-message vec 5 "Finding a suitable `ls' command") |
| 5334 | (or | 5334 | (or |
| 5335 | (catch 'ls-found | 5335 | (catch 'ls-found |
| 5336 | (dolist (cmd '("ls" "gnuls" "gls")) | 5336 | (dolist (cmd '("ls" "gnuls" "gls")) |
| @@ -5351,12 +5351,12 @@ Return ATTR." | |||
| 5351 | (setq result (concat result " --color=never"))) | 5351 | (setq result (concat result " --color=never"))) |
| 5352 | (throw 'ls-found result)) | 5352 | (throw 'ls-found result)) |
| 5353 | (setq dl (cdr dl)))))) | 5353 | (setq dl (cdr dl)))))) |
| 5354 | (tramp-error vec 'file-error "Couldn’t find a proper ‘ls’ command")))) | 5354 | (tramp-error vec 'file-error "Couldn't find a proper `ls' command")))) |
| 5355 | 5355 | ||
| 5356 | (defun tramp-get-ls-command-with-dired (vec) | 5356 | (defun tramp-get-ls-command-with-dired (vec) |
| 5357 | (save-match-data | 5357 | (save-match-data |
| 5358 | (with-tramp-connection-property vec "ls-dired" | 5358 | (with-tramp-connection-property vec "ls-dired" |
| 5359 | (tramp-message vec 5 "Checking, whether ‘ls --dired’ works") | 5359 | (tramp-message vec 5 "Checking, whether `ls --dired' works") |
| 5360 | ;; Some "ls" versions are sensible wrt the order of arguments, | 5360 | ;; Some "ls" versions are sensible wrt the order of arguments, |
| 5361 | ;; they fail when "-al" is after the "--dired" argument (for | 5361 | ;; they fail when "-al" is after the "--dired" argument (for |
| 5362 | ;; example on FreeBSD). | 5362 | ;; example on FreeBSD). |
| @@ -5366,7 +5366,7 @@ Return ATTR." | |||
| 5366 | (defun tramp-get-ls-command-with-quoting-style (vec) | 5366 | (defun tramp-get-ls-command-with-quoting-style (vec) |
| 5367 | (save-match-data | 5367 | (save-match-data |
| 5368 | (with-tramp-connection-property vec "ls-quoting-style" | 5368 | (with-tramp-connection-property vec "ls-quoting-style" |
| 5369 | (tramp-message vec 5 "Checking, whether ‘ls --quoting-style=shell’ works") | 5369 | (tramp-message vec 5 "Checking, whether `ls --quoting-style=shell' works") |
| 5370 | ;; Some "ls" versions are sensible wrt the order of arguments, | 5370 | ;; Some "ls" versions are sensible wrt the order of arguments, |
| 5371 | ;; they fail when "-al" is after the "--dired" argument (for | 5371 | ;; they fail when "-al" is after the "--dired" argument (for |
| 5372 | ;; example on FreeBSD). | 5372 | ;; example on FreeBSD). |
| @@ -5376,7 +5376,7 @@ Return ATTR." | |||
| 5376 | 5376 | ||
| 5377 | (defun tramp-get-test-command (vec) | 5377 | (defun tramp-get-test-command (vec) |
| 5378 | (with-tramp-connection-property vec "test" | 5378 | (with-tramp-connection-property vec "test" |
| 5379 | (tramp-message vec 5 "Finding a suitable ‘test’ command") | 5379 | (tramp-message vec 5 "Finding a suitable `test' command") |
| 5380 | (if (tramp-send-command-and-check vec "test 0") | 5380 | (if (tramp-send-command-and-check vec "test 0") |
| 5381 | "test" | 5381 | "test" |
| 5382 | (tramp-find-executable vec "test" (tramp-get-remote-path vec))))) | 5382 | (tramp-find-executable vec "test" (tramp-get-remote-path vec))))) |
| @@ -5409,12 +5409,12 @@ Return ATTR." | |||
| 5409 | 5409 | ||
| 5410 | (defun tramp-get-remote-ln (vec) | 5410 | (defun tramp-get-remote-ln (vec) |
| 5411 | (with-tramp-connection-property vec "ln" | 5411 | (with-tramp-connection-property vec "ln" |
| 5412 | (tramp-message vec 5 "Finding a suitable ‘ln’ command") | 5412 | (tramp-message vec 5 "Finding a suitable `ln' command") |
| 5413 | (tramp-find-executable vec "ln" (tramp-get-remote-path vec)))) | 5413 | (tramp-find-executable vec "ln" (tramp-get-remote-path vec)))) |
| 5414 | 5414 | ||
| 5415 | (defun tramp-get-remote-perl (vec) | 5415 | (defun tramp-get-remote-perl (vec) |
| 5416 | (with-tramp-connection-property vec "perl" | 5416 | (with-tramp-connection-property vec "perl" |
| 5417 | (tramp-message vec 5 "Finding a suitable ‘perl’ command") | 5417 | (tramp-message vec 5 "Finding a suitable `perl' command") |
| 5418 | (let ((result | 5418 | (let ((result |
| 5419 | (or (tramp-find-executable vec "perl5" (tramp-get-remote-path vec)) | 5419 | (or (tramp-find-executable vec "perl5" (tramp-get-remote-path vec)) |
| 5420 | (tramp-find-executable | 5420 | (tramp-find-executable |
| @@ -5431,7 +5431,7 @@ Return ATTR." | |||
| 5431 | 5431 | ||
| 5432 | (defun tramp-get-remote-stat (vec) | 5432 | (defun tramp-get-remote-stat (vec) |
| 5433 | (with-tramp-connection-property vec "stat" | 5433 | (with-tramp-connection-property vec "stat" |
| 5434 | (tramp-message vec 5 "Finding a suitable ‘stat’ command") | 5434 | (tramp-message vec 5 "Finding a suitable `stat' command") |
| 5435 | (let ((result (tramp-find-executable | 5435 | (let ((result (tramp-find-executable |
| 5436 | vec "stat" (tramp-get-remote-path vec))) | 5436 | vec "stat" (tramp-get-remote-path vec))) |
| 5437 | tmp) | 5437 | tmp) |
| @@ -5449,7 +5449,7 @@ Return ATTR." | |||
| 5449 | 5449 | ||
| 5450 | (defun tramp-get-remote-readlink (vec) | 5450 | (defun tramp-get-remote-readlink (vec) |
| 5451 | (with-tramp-connection-property vec "readlink" | 5451 | (with-tramp-connection-property vec "readlink" |
| 5452 | (tramp-message vec 5 "Finding a suitable ‘readlink’ command") | 5452 | (tramp-message vec 5 "Finding a suitable `readlink' command") |
| 5453 | (let ((result (tramp-find-executable | 5453 | (let ((result (tramp-find-executable |
| 5454 | vec "readlink" (tramp-get-remote-path vec)))) | 5454 | vec "readlink" (tramp-get-remote-path vec)))) |
| 5455 | (when (and result | 5455 | (when (and result |
| @@ -5459,12 +5459,12 @@ Return ATTR." | |||
| 5459 | 5459 | ||
| 5460 | (defun tramp-get-remote-trash (vec) | 5460 | (defun tramp-get-remote-trash (vec) |
| 5461 | (with-tramp-connection-property vec "trash" | 5461 | (with-tramp-connection-property vec "trash" |
| 5462 | (tramp-message vec 5 "Finding a suitable ‘trash’ command") | 5462 | (tramp-message vec 5 "Finding a suitable `trash' command") |
| 5463 | (tramp-find-executable vec "trash" (tramp-get-remote-path vec)))) | 5463 | (tramp-find-executable vec "trash" (tramp-get-remote-path vec)))) |
| 5464 | 5464 | ||
| 5465 | (defun tramp-get-remote-touch (vec) | 5465 | (defun tramp-get-remote-touch (vec) |
| 5466 | (with-tramp-connection-property vec "touch" | 5466 | (with-tramp-connection-property vec "touch" |
| 5467 | (tramp-message vec 5 "Finding a suitable ‘touch’ command") | 5467 | (tramp-message vec 5 "Finding a suitable `touch' command") |
| 5468 | (let ((result (tramp-find-executable | 5468 | (let ((result (tramp-find-executable |
| 5469 | vec "touch" (tramp-get-remote-path vec))) | 5469 | vec "touch" (tramp-get-remote-path vec))) |
| 5470 | (tmpfile | 5470 | (tmpfile |
| @@ -5488,18 +5488,18 @@ Return ATTR." | |||
| 5488 | 5488 | ||
| 5489 | (defun tramp-get-remote-gvfs-monitor-dir (vec) | 5489 | (defun tramp-get-remote-gvfs-monitor-dir (vec) |
| 5490 | (with-tramp-connection-property vec "gvfs-monitor-dir" | 5490 | (with-tramp-connection-property vec "gvfs-monitor-dir" |
| 5491 | (tramp-message vec 5 "Finding a suitable ‘gvfs-monitor-dir’ command") | 5491 | (tramp-message vec 5 "Finding a suitable `gvfs-monitor-dir' command") |
| 5492 | (tramp-find-executable | 5492 | (tramp-find-executable |
| 5493 | vec "gvfs-monitor-dir" (tramp-get-remote-path vec) t t))) | 5493 | vec "gvfs-monitor-dir" (tramp-get-remote-path vec) t t))) |
| 5494 | 5494 | ||
| 5495 | (defun tramp-get-remote-inotifywait (vec) | 5495 | (defun tramp-get-remote-inotifywait (vec) |
| 5496 | (with-tramp-connection-property vec "inotifywait" | 5496 | (with-tramp-connection-property vec "inotifywait" |
| 5497 | (tramp-message vec 5 "Finding a suitable ‘inotifywait’ command") | 5497 | (tramp-message vec 5 "Finding a suitable `inotifywait' command") |
| 5498 | (tramp-find-executable vec "inotifywait" (tramp-get-remote-path vec) t t))) | 5498 | (tramp-find-executable vec "inotifywait" (tramp-get-remote-path vec) t t))) |
| 5499 | 5499 | ||
| 5500 | (defun tramp-get-remote-id (vec) | 5500 | (defun tramp-get-remote-id (vec) |
| 5501 | (with-tramp-connection-property vec "id" | 5501 | (with-tramp-connection-property vec "id" |
| 5502 | (tramp-message vec 5 "Finding POSIX ‘id’ command") | 5502 | (tramp-message vec 5 "Finding POSIX `id' command") |
| 5503 | (catch 'id-found | 5503 | (catch 'id-found |
| 5504 | (dolist (cmd '("id" "gid")) | 5504 | (dolist (cmd '("id" "gid")) |
| 5505 | (let ((dl (tramp-get-remote-path vec)) | 5505 | (let ((dl (tramp-get-remote-path vec)) |
| @@ -5530,7 +5530,7 @@ Return ATTR." | |||
| 5530 | 5530 | ||
| 5531 | (defun tramp-get-remote-python (vec) | 5531 | (defun tramp-get-remote-python (vec) |
| 5532 | (with-tramp-connection-property vec "python" | 5532 | (with-tramp-connection-property vec "python" |
| 5533 | (tramp-message vec 5 "Finding a suitable ‘python’ command") | 5533 | (tramp-message vec 5 "Finding a suitable `python' command") |
| 5534 | (or (tramp-find-executable vec "python" (tramp-get-remote-path vec)) | 5534 | (or (tramp-find-executable vec "python" (tramp-get-remote-path vec)) |
| 5535 | (tramp-find-executable vec "python2" (tramp-get-remote-path vec)) | 5535 | (tramp-find-executable vec "python2" (tramp-get-remote-path vec)) |
| 5536 | (tramp-find-executable vec "python3" (tramp-get-remote-path vec))))) | 5536 | (tramp-find-executable vec "python3" (tramp-get-remote-path vec))))) |
diff --git a/lisp/net/tramp-smb.el b/lisp/net/tramp-smb.el index 6fefa3f9614..c4f0f1f500a 100644 --- a/lisp/net/tramp-smb.el +++ b/lisp/net/tramp-smb.el | |||
| @@ -115,7 +115,7 @@ call, letting the SMB client use the default one." | |||
| 115 | "Read from server failed, maybe it closed the connection" | 115 | "Read from server failed, maybe it closed the connection" |
| 116 | "Call timed out: server did not respond" | 116 | "Call timed out: server did not respond" |
| 117 | "\\S-+: command not found" | 117 | "\\S-+: command not found" |
| 118 | "Server doesn’t support UNIX CIFS calls" | 118 | "Server doesn't support UNIX CIFS calls" |
| 119 | ,(regexp-opt | 119 | ,(regexp-opt |
| 120 | '(;; Samba. | 120 | '(;; Samba. |
| 121 | "ERRDOS" | 121 | "ERRDOS" |
| @@ -374,7 +374,7 @@ pass to the OPERATION." | |||
| 374 | (tramp-smb-get-localname v2))) | 374 | (tramp-smb-get-localname v2))) |
| 375 | (tramp-error | 375 | (tramp-error |
| 376 | v2 'file-error | 376 | v2 'file-error |
| 377 | "error with add-name-to-file, see buffer ‘%s’ for details" | 377 | "error with add-name-to-file, see buffer `%s' for details" |
| 378 | (buffer-name)))))) | 378 | (buffer-name)))))) |
| 379 | 379 | ||
| 380 | (defun tramp-smb-action-with-tar (proc vec) | 380 | (defun tramp-smb-action-with-tar (proc vec) |
| @@ -581,12 +581,12 @@ PRESERVE-UID-GID and PRESERVE-EXTENDED-ATTRIBUTES are completely ignored." | |||
| 581 | (tramp-flush-file-property v localname) | 581 | (tramp-flush-file-property v localname) |
| 582 | (unless (tramp-smb-get-share v) | 582 | (unless (tramp-smb-get-share v) |
| 583 | (tramp-error | 583 | (tramp-error |
| 584 | v 'file-error "Target ‘%s’ must contain a share name" newname)) | 584 | v 'file-error "Target `%s' must contain a share name" newname)) |
| 585 | (unless (tramp-smb-send-command | 585 | (unless (tramp-smb-send-command |
| 586 | v (format "put \"%s\" \"%s\"" | 586 | v (format "put \"%s\" \"%s\"" |
| 587 | filename (tramp-smb-get-localname v))) | 587 | filename (tramp-smb-get-localname v))) |
| 588 | (tramp-error | 588 | (tramp-error |
| 589 | v 'file-error "Cannot copy ‘%s’ to ‘%s’" filename newname)))))) | 589 | v 'file-error "Cannot copy `%s' to `%s'" filename newname)))))) |
| 590 | 590 | ||
| 591 | ;; KEEP-DATE handling. | 591 | ;; KEEP-DATE handling. |
| 592 | (when keep-date | 592 | (when keep-date |
| @@ -621,7 +621,7 @@ PRESERVE-UID-GID and PRESERVE-EXTENDED-ATTRIBUTES are completely ignored." | |||
| 621 | (goto-char (point-min)) | 621 | (goto-char (point-min)) |
| 622 | (search-forward-regexp tramp-smb-errors nil t) | 622 | (search-forward-regexp tramp-smb-errors nil t) |
| 623 | (tramp-error | 623 | (tramp-error |
| 624 | v 'file-error "%s ‘%s’" (match-string 0) directory)))))) | 624 | v 'file-error "%s `%s'" (match-string 0) directory)))))) |
| 625 | 625 | ||
| 626 | (defun tramp-smb-handle-delete-file (filename &optional _trash) | 626 | (defun tramp-smb-handle-delete-file (filename &optional _trash) |
| 627 | "Like `delete-file' for Tramp files." | 627 | "Like `delete-file' for Tramp files." |
| @@ -642,7 +642,7 @@ PRESERVE-UID-GID and PRESERVE-EXTENDED-ATTRIBUTES are completely ignored." | |||
| 642 | (goto-char (point-min)) | 642 | (goto-char (point-min)) |
| 643 | (search-forward-regexp tramp-smb-errors nil t) | 643 | (search-forward-regexp tramp-smb-errors nil t) |
| 644 | (tramp-error | 644 | (tramp-error |
| 645 | v 'file-error "%s ‘%s’" (match-string 0) filename)))))) | 645 | v 'file-error "%s `%s'" (match-string 0) filename)))))) |
| 646 | 646 | ||
| 647 | (defun tramp-smb-handle-directory-files | 647 | (defun tramp-smb-handle-directory-files |
| 648 | (directory &optional full match nosort) | 648 | (directory &optional full match nosort) |
| @@ -891,7 +891,7 @@ PRESERVE-UID-GID and PRESERVE-EXTENDED-ATTRIBUTES are completely ignored." | |||
| 891 | (unless (file-exists-p filename) | 891 | (unless (file-exists-p filename) |
| 892 | (tramp-error | 892 | (tramp-error |
| 893 | v 'file-error | 893 | v 'file-error |
| 894 | "Cannot make local copy of non-existing file ‘%s’" filename)) | 894 | "Cannot make local copy of non-existing file `%s'" filename)) |
| 895 | (let ((tmpfile (tramp-compat-make-temp-file filename))) | 895 | (let ((tmpfile (tramp-compat-make-temp-file filename))) |
| 896 | (with-tramp-progress-reporter | 896 | (with-tramp-progress-reporter |
| 897 | v 3 (format "Fetching %s to tmp file %s" filename tmpfile) | 897 | v 3 (format "Fetching %s to tmp file %s" filename tmpfile) |
| @@ -901,7 +901,7 @@ PRESERVE-UID-GID and PRESERVE-EXTENDED-ATTRIBUTES are completely ignored." | |||
| 901 | ;; Oops, an error. We shall cleanup. | 901 | ;; Oops, an error. We shall cleanup. |
| 902 | (delete-file tmpfile) | 902 | (delete-file tmpfile) |
| 903 | (tramp-error | 903 | (tramp-error |
| 904 | v 'file-error "Cannot make local copy of file ‘%s’" filename))) | 904 | v 'file-error "Cannot make local copy of file `%s'" filename))) |
| 905 | tmpfile))) | 905 | tmpfile))) |
| 906 | 906 | ||
| 907 | ;; This function should return "foo/" for directories and "bar" for | 907 | ;; This function should return "foo/" for directories and "bar" for |
| @@ -1055,7 +1055,7 @@ PRESERVE-UID-GID and PRESERVE-EXTENDED-ATTRIBUTES are completely ignored." | |||
| 1055 | (when (file-directory-p ldir) | 1055 | (when (file-directory-p ldir) |
| 1056 | (make-directory-internal dir)) | 1056 | (make-directory-internal dir)) |
| 1057 | (unless (file-directory-p dir) | 1057 | (unless (file-directory-p dir) |
| 1058 | (tramp-error v 'file-error "Couldn’t make directory %s" dir)))))) | 1058 | (tramp-error v 'file-error "Couldn't make directory %s" dir)))))) |
| 1059 | 1059 | ||
| 1060 | (defun tramp-smb-handle-make-directory-internal (directory) | 1060 | (defun tramp-smb-handle-make-directory-internal (directory) |
| 1061 | "Like `make-directory-internal' for Tramp files." | 1061 | "Like `make-directory-internal' for Tramp files." |
| @@ -1079,7 +1079,7 @@ PRESERVE-UID-GID and PRESERVE-EXTENDED-ATTRIBUTES are completely ignored." | |||
| 1079 | (tramp-flush-file-property v localname)) | 1079 | (tramp-flush-file-property v localname)) |
| 1080 | (unless (file-directory-p directory) | 1080 | (unless (file-directory-p directory) |
| 1081 | (tramp-error | 1081 | (tramp-error |
| 1082 | v 'file-error "Couldn’t make directory %s" directory)))))) | 1082 | v 'file-error "Couldn't make directory %s" directory)))))) |
| 1083 | 1083 | ||
| 1084 | (defun tramp-smb-handle-make-symbolic-link | 1084 | (defun tramp-smb-handle-make-symbolic-link |
| 1085 | (filename linkname &optional ok-if-already-exists) | 1085 | (filename linkname &optional ok-if-already-exists) |
| @@ -1130,7 +1130,7 @@ target of the symlink differ." | |||
| 1130 | (tramp-smb-get-localname v2))) | 1130 | (tramp-smb-get-localname v2))) |
| 1131 | (tramp-error | 1131 | (tramp-error |
| 1132 | v2 'file-error | 1132 | v2 'file-error |
| 1133 | "error with make-symbolic-link, see buffer ‘%s’ for details" | 1133 | "error with make-symbolic-link, see buffer `%s' for details" |
| 1134 | (buffer-name)))))) | 1134 | (buffer-name)))))) |
| 1135 | 1135 | ||
| 1136 | (defun tramp-smb-handle-process-file | 1136 | (defun tramp-smb-handle-process-file |
| @@ -1289,12 +1289,12 @@ target of the symlink differ." | |||
| 1289 | (tramp-flush-file-property v2 v2-localname) | 1289 | (tramp-flush-file-property v2 v2-localname) |
| 1290 | (unless (tramp-smb-get-share v2) | 1290 | (unless (tramp-smb-get-share v2) |
| 1291 | (tramp-error | 1291 | (tramp-error |
| 1292 | v2 'file-error "Target ‘%s’ must contain a share name" newname)) | 1292 | v2 'file-error "Target `%s' must contain a share name" newname)) |
| 1293 | (unless (tramp-smb-send-command | 1293 | (unless (tramp-smb-send-command |
| 1294 | v2 (format "rename \"%s\" \"%s\"" | 1294 | v2 (format "rename \"%s\" \"%s\"" |
| 1295 | (tramp-smb-get-localname v1) | 1295 | (tramp-smb-get-localname v1) |
| 1296 | (tramp-smb-get-localname v2))) | 1296 | (tramp-smb-get-localname v2))) |
| 1297 | (tramp-error v2 'file-error "Cannot rename ‘%s’" filename)))) | 1297 | (tramp-error v2 'file-error "Cannot rename `%s'" filename)))) |
| 1298 | 1298 | ||
| 1299 | ;; We must rename via copy. | 1299 | ;; We must rename via copy. |
| 1300 | (tramp-compat-copy-file filename newname ok-if-already-exists t t t) | 1300 | (tramp-compat-copy-file filename newname ok-if-already-exists t t t) |
| @@ -1371,7 +1371,7 @@ target of the symlink differ." | |||
| 1371 | (unless (re-search-backward "tramp_exit_status [0-9]+" nil t) | 1371 | (unless (re-search-backward "tramp_exit_status [0-9]+" nil t) |
| 1372 | (tramp-error | 1372 | (tramp-error |
| 1373 | v 'file-error | 1373 | v 'file-error |
| 1374 | "Couldn’t find exit status of ‘%s’" tramp-smb-acl-program)) | 1374 | "Couldn't find exit status of `%s'" tramp-smb-acl-program)) |
| 1375 | (skip-chars-forward "^ ") | 1375 | (skip-chars-forward "^ ") |
| 1376 | (when (zerop (read (current-buffer))) | 1376 | (when (zerop (read (current-buffer))) |
| 1377 | ;; Success. | 1377 | ;; Success. |
| @@ -1392,7 +1392,7 @@ target of the symlink differ." | |||
| 1392 | (tramp-smb-get-localname v) | 1392 | (tramp-smb-get-localname v) |
| 1393 | (tramp-compat-decimal-to-octal mode))) | 1393 | (tramp-compat-decimal-to-octal mode))) |
| 1394 | (tramp-error | 1394 | (tramp-error |
| 1395 | v 'file-error "Error while changing file’s mode %s" filename))))) | 1395 | v 'file-error "Error while changing file's mode %s" filename))))) |
| 1396 | 1396 | ||
| 1397 | ;; We use BUFFER also as connection buffer during setup. Because of | 1397 | ;; We use BUFFER also as connection buffer during setup. Because of |
| 1398 | ;; this, its original contents must be saved, and restored once | 1398 | ;; this, its original contents must be saved, and restored once |
| @@ -1490,13 +1490,13 @@ errors for shares like \"C$/\", which are common in Microsoft Windows." | |||
| 1490 | (unless (tramp-smb-send-command | 1490 | (unless (tramp-smb-send-command |
| 1491 | v (format "put %s \"%s\"" | 1491 | v (format "put %s \"%s\"" |
| 1492 | tmpfile (tramp-smb-get-localname v))) | 1492 | tmpfile (tramp-smb-get-localname v))) |
| 1493 | (tramp-error v 'file-error "Cannot write ‘%s’" filename)) | 1493 | (tramp-error v 'file-error "Cannot write `%s'" filename)) |
| 1494 | (delete-file tmpfile))) | 1494 | (delete-file tmpfile))) |
| 1495 | 1495 | ||
| 1496 | (unless (equal curbuf (current-buffer)) | 1496 | (unless (equal curbuf (current-buffer)) |
| 1497 | (tramp-error | 1497 | (tramp-error |
| 1498 | v 'file-error | 1498 | v 'file-error |
| 1499 | "Buffer has changed from ‘%s’ to ‘%s’" curbuf (current-buffer))) | 1499 | "Buffer has changed from `%s' to `%s'" curbuf (current-buffer))) |
| 1500 | (when (eq visit t) | 1500 | (when (eq visit t) |
| 1501 | (set-visited-file-modtime))))) | 1501 | (set-visited-file-modtime))))) |
| 1502 | 1502 | ||
| @@ -1563,7 +1563,7 @@ Result is a list of (LOCALNAME MODE SIZE MONTH DAY TIME YEAR)." | |||
| 1563 | ;; Loop the listing. | 1563 | ;; Loop the listing. |
| 1564 | (goto-char (point-min)) | 1564 | (goto-char (point-min)) |
| 1565 | (if (re-search-forward tramp-smb-errors nil t) | 1565 | (if (re-search-forward tramp-smb-errors nil t) |
| 1566 | (tramp-error v 'file-error "%s ‘%s’" (match-string 0) directory) | 1566 | (tramp-error v 'file-error "%s `%s'" (match-string 0) directory) |
| 1567 | (while (not (eobp)) | 1567 | (while (not (eobp)) |
| 1568 | (setq entry (tramp-smb-read-file-entry share)) | 1568 | (setq entry (tramp-smb-read-file-entry share)) |
| 1569 | (forward-line) | 1569 | (forward-line) |
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 69d7e1fe613..bf3e1c740de 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el | |||
| @@ -3094,7 +3094,7 @@ User is always nil." | |||
| 3094 | v 'file-error "File `%s' not found on remote host" filename) | 3094 | v 'file-error "File `%s' not found on remote host" filename) |
| 3095 | 3095 | ||
| 3096 | (with-tramp-progress-reporter | 3096 | (with-tramp-progress-reporter |
| 3097 | v 3 (format "Inserting `%s'" filename) | 3097 | v 3 (format-message "Inserting `%s'" filename) |
| 3098 | (condition-case err | 3098 | (condition-case err |
| 3099 | (if (and (tramp-local-host-p v) | 3099 | (if (and (tramp-local-host-p v) |
| 3100 | (let (file-name-handler-alist) | 3100 | (let (file-name-handler-alist) |
| @@ -3600,7 +3600,7 @@ connection buffer." | |||
| 3600 | " `\\[tramp-cleanup-this-connection]'"))) | 3600 | " `\\[tramp-cleanup-this-connection]'"))) |
| 3601 | ((eq exit 'timeout) | 3601 | ((eq exit 'timeout) |
| 3602 | (format-message | 3602 | (format-message |
| 3603 | "Timeout reached, see buffer ‘%s’ for details" | 3603 | "Timeout reached, see buffer `%s' for details" |
| 3604 | (tramp-get-connection-buffer vec))) | 3604 | (tramp-get-connection-buffer vec))) |
| 3605 | (t "Login failed"))))) | 3605 | (t "Login failed"))))) |
| 3606 | (when (numberp pos) | 3606 | (when (numberp pos) |