Commit b12cfbfd authored by Paul Eggert's avatar Paul Eggert

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.
parent 27b2cff2
......@@ -258,7 +258,7 @@ pass to the OPERATION."
method user host
(with-tramp-file-property v localname "file-truename"
(let ((result nil)) ; result steps in reverse order
(tramp-message v 4 "Finding true name for ‘%s’" filename)
(tramp-message v 4 "Finding true name for `%s'" filename)
(let* ((directory-sep-char ?/)
(steps (tramp-compat-split-string localname "/"))
(localnamedir (tramp-run-real-handler
......@@ -290,9 +290,9 @@ pass to the OPERATION."
(list thisstep))
"/")))))
(cond ((string= "." thisstep)
(tramp-message v 5 "Ignoring step ‘.’"))
(tramp-message v 5 "Ignoring step `.'"))
((string= ".." thisstep)
(tramp-message v 5 "Processing step ‘..’")
(tramp-message v 5 "Processing step `..'")
(pop result))
((stringp symlink-target)
;; It's a symlink, follow it.
......@@ -307,7 +307,7 @@ pass to the OPERATION."
(unless (tramp-equal-remote filename symlink-target)
(tramp-error
v 'file-error
"Symlink target ‘%s’ on wrong host" symlink-target))
"Symlink target `%s' on wrong host" symlink-target))
(setq symlink-target localname))
(setq steps
(append (tramp-compat-split-string
......@@ -330,7 +330,7 @@ pass to the OPERATION."
(not (string= (substring result -1) "/"))))
(setq result (concat result "/"))))
(tramp-message v 4 "True name of ‘%s’ is ‘%s’" localname result)
(tramp-message v 4 "True name of `%s' is `%s'" localname result)
result))))
;; Preserve trailing "/".
......@@ -433,7 +433,7 @@ pass to the OPERATION."
(defun tramp-adb-get-ls-command (vec)
(with-tramp-connection-property vec "ls"
(tramp-message vec 5 "Finding a suitable ‘ls’ command")
(tramp-message vec 5 "Finding a suitable `ls' command")
(if (tramp-adb-send-command-and-check vec "ls --color=never -al /dev/null")
;; On CyanogenMod based system BusyBox is used and "ls" output
;; coloring is enabled by default. So we try to disable it
......@@ -514,7 +514,7 @@ Emacs dired can't find files."
(make-directory par parents))))
(tramp-adb-barf-unless-okay
v (format "mkdir %s" (tramp-shell-quote-argument localname))
"Couldnt make directory %s" dir)
"Couldn't make directory %s" dir)
(tramp-flush-file-property v (file-name-directory localname))
(tramp-flush-directory-property v localname)))
......@@ -528,7 +528,7 @@ Emacs dired can't find files."
v (format "%s %s"
(if recursive "rm -r" "rmdir")
(tramp-shell-quote-argument localname))
"Couldnt delete %s" directory)))
"Couldn't delete %s" directory)))
(defun tramp-adb-handle-delete-file (filename &optional _trash)
"Like `delete-file' for Tramp files."
......@@ -538,7 +538,7 @@ Emacs dired can't find files."
(tramp-flush-file-property v localname)
(tramp-adb-barf-unless-okay
v (format "rm %s" (tramp-shell-quote-argument localname))
"Couldnt delete %s" filename)))
"Couldn't delete %s" filename)))
(defun tramp-adb-handle-file-name-all-completions (filename directory)
"Like `file-name-all-completions' for Tramp files."
......@@ -571,7 +571,7 @@ Emacs dired can't find files."
(unless (file-exists-p (file-truename filename))
(tramp-error
v 'file-error
"Cannot make local copy of non-existing file ‘%s’" filename))
"Cannot make local copy of non-existing file `%s'" filename))
(let ((tmpfile (tramp-compat-make-temp-file filename)))
(with-tramp-progress-reporter
v 3 (format "Fetching %s to tmp file %s" filename tmpfile)
......@@ -580,7 +580,7 @@ Emacs dired can't find files."
(not (file-exists-p tmpfile)))
(ignore-errors (delete-file tmpfile))
(tramp-error
v 'file-error "Cannot make local copy of file ‘%s’" filename))
v 'file-error "Cannot make local copy of file `%s'" filename))
(set-file-modes
tmpfile
(logior (or (file-modes filename) 0)
......@@ -636,10 +636,10 @@ But handle the case, if the \"test\" command is not available."
(list start end tmpfile append 'no-message lockname confirm))
(with-tramp-progress-reporter
v 3 (format-message
"Moving tmp file ‘%s’ to ‘%s’" tmpfile filename)
"Moving tmp file `%s' to `%s'" tmpfile filename)
(unwind-protect
(when (tramp-adb-execute-adb-command v "push" tmpfile localname)
(tramp-error v 'file-error "Cannot write: ‘%s’" filename))
(tramp-error v 'file-error "Cannot write: `%s'" filename))
(delete-file tmpfile)))
(when (or (eq visit t) (stringp visit))
......@@ -648,7 +648,7 @@ But handle the case, if the \"test\" command is not available."
(unless (equal curbuf (current-buffer))
(tramp-error
v 'file-error
"Buffer has changed from ‘%s’ to ‘%s’" curbuf (current-buffer))))))
"Buffer has changed from `%s' to `%s'" curbuf (current-buffer))))))
(defun tramp-adb-handle-set-file-modes (filename mode)
"Like `set-file-modes' for Tramp files."
......@@ -713,7 +713,7 @@ PRESERVE-UID-GID and PRESERVE-EXTENDED-ATTRIBUTES are completely ignored."
(tramp-flush-file-property v localname)
(when (tramp-adb-execute-adb-command v "push" filename localname)
(tramp-error
v 'file-error "Cannot copy ‘%s’ ‘%s’" filename newname))))))
v 'file-error "Cannot copy `%s' `%s'" filename newname))))))
;; KEEP-DATE handling.
(when keep-date
......@@ -1114,7 +1114,7 @@ the exit status is not equal 0, and t otherwise."
(goto-char (point-max))
(unless (re-search-backward "tramp_exit_status [0-9]+" nil t)
(tramp-error
vec 'file-error "Couldn’t find exit status of ‘%s’" command))
vec 'file-error "Couldn't find exit status of `%s'" command))
(skip-chars-forward "^ ")
(prog1
(zerop (read (current-buffer)))
......@@ -1131,7 +1131,7 @@ FMT and ARGS are passed to `error'."
"Wait for output from remote command."
(unless (buffer-live-p (process-buffer proc))
(delete-process proc)
(tramp-error proc 'file-error "Process ‘%s’ not available, try again" proc))
(tramp-error proc 'file-error "Process `%s' not available, try again" proc))
(with-current-buffer (process-buffer proc)
(if (tramp-wait-for-regexp proc timeout tramp-adb-prompt)
(let (buffer-read-only)
......@@ -1151,11 +1151,11 @@ FMT and ARGS are passed to `error'."
(if timeout
(tramp-error
proc 'file-error
"[[Remote adb prompt ‘%s’ not found in %d secs]]"
"[[Remote adb prompt `%s' not found in %d secs]]"
tramp-adb-prompt timeout)
(tramp-error
proc 'file-error
"[[Remote prompt ‘%s’ not found]]" tramp-adb-prompt)))))
"[[Remote prompt `%s' not found]]" tramp-adb-prompt)))))
(defun tramp-adb-maybe-open-connection (vec)
"Maybe open a connection VEC.
......@@ -1178,7 +1178,7 @@ connection if a previous connection has died for some reason."
;; use a connection property, because we have not checked yet
;; whether it is still the same device.
(when (and user (not (tramp-get-file-property vec "" "su-command-p" t)))
(tramp-error vec 'file-error "Cannot switch to user ‘%s’" user))
(tramp-error vec 'file-error "Cannot switch to user `%s'" user))
(unless
(and p (processp p) (memq (process-status p) '(run open)))
......@@ -1224,7 +1224,7 @@ connection if a previous connection has died for some reason."
(not (string-equal old-getprop new-getprop)))
(tramp-message
vec 3
"Connection reset, because remote host changed from ‘%s’ to ‘%s’"
"Connection reset, because remote host changed from `%s' to `%s'"
old-getprop new-getprop)
(tramp-cleanup-connection vec t)
(tramp-adb-maybe-open-connection vec)))
......@@ -1236,7 +1236,7 @@ connection if a previous connection has died for some reason."
(delete-process p)
(tramp-set-file-property vec "" "su-command-p" nil)
(tramp-error
vec 'file-error "Cannot switch to user ‘%s’" user)))
vec 'file-error "Cannot switch to user `%s'" user)))
;; Set "remote-path" connection property. This is needed
;; for eshell.
......
......@@ -440,8 +440,8 @@ for all methods. Resulting data are derived from connection history."
(clrhash tramp-cache-data))
(error
;; File is corrupted.
(message "Tramp persistency file ‘%s’ is corrupted: %s"
tramp-persistency-file-name (error-message-string err))
(format-message "Tramp persistency file `%s' is corrupted: %s"
tramp-persistency-file-name (error-message-string err))
(clrhash tramp-cache-data))))
(add-hook 'tramp-unload-hook
......
......@@ -236,8 +236,8 @@ this is the function `temp-directory'."
((let ((d (getenv "TMPDIR"))) (and d (file-directory-p d)))
(file-name-as-directory (getenv "TMPDIR")))
((file-exists-p "c:/temp") (file-name-as-directory "c:/temp"))
(t (message (concat "Neither ‘temporary-file-directory’ nor "
"‘temp-directory’ is defined -- using /tmp."))
(t (message (concat "Neither `temporary-file-directory' nor "
"`temp-directory' is defined -- using /tmp."))
(file-name-as-directory "/tmp")))))
;; `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?"
(let ((x (or ostr "")))
;; `save-match' is in `tramp-mode-string-to-int' which calls this.
(unless (string-match "\\`[0-7]*\\'" x)
(error "Non-octal junk in string ‘%s’" x))
(error "Non-octal junk in string `%s'" x))
(string-to-number ostr 8)))
;; ID-FORMAT does not exist in XEmacs.
......@@ -535,9 +535,9 @@ EOL-TYPE can be one of `dos', `unix', or `mac'."
((eq eol-type 'mac) 'cr)
(t
(error
"Unknown EOL-TYPE ‘%s’, must be ‘dos’, ‘unix’, or ‘mac’"
"Unknown EOL-TYPE `%s', must be `dos', `unix', or `mac'"
eol-type)))))
(t (error "Cant change EOL conversion -- is MULE missing?"))))
(t (error "Can't change EOL conversion -- is MULE missing?"))))
;; `replace-regexp-in-string' does not exist in XEmacs.
;; Implementation is taken from Emacs 24.
......@@ -595,21 +595,11 @@ and replace a sub-expression, e.g.
(unless (fboundp 'default-toplevel-value)
(defalias 'default-toplevel-value 'symbol-value))
;; ‘format-message’ is new in Emacs 25, and does not exist in XEmacs.
;; `format-message' is new in Emacs 25, and does not exist in XEmacs.
;; The substitute implementation always uses grave quoting style, for
;; compatibility with older Emacs.
(unless (fboundp 'format-message)
(defalias 'format-message
(lambda (format-string &rest args)
(let ((restyled-format-string
(let ((start (string-match "[‘’]" format-string)))
(if start
(tramp-compat-replace-regexp-in-string
"[‘’]"
(lambda (match) (if (string-equal match "‘") "`" "'"))
format-string t t nil start)
format-string))))
(apply #'format restyled-format-string args)))))
(defalias 'format-message 'format))
(add-hook 'tramp-unload-hook
(lambda ()
......
......@@ -494,7 +494,7 @@ Operations not mentioned here will be handled by the default Emacs primitives.")
First arg specifies the OPERATION, second arg is a list of arguments to
pass to the OPERATION."
(unless tramp-gvfs-enabled
(tramp-user-error nil "Package ‘tramp-gvfs’ not supported"))
(tramp-user-error nil "Package `tramp-gvfs' not supported"))
(let ((fn (assoc operation tramp-gvfs-file-name-handler-alist)))
(if fn
(save-match-data (apply (cdr fn) args))
......@@ -600,7 +600,7 @@ This function is invoked by `tramp-gvfs-handle-copy-file' and
of `copy' and `rename'. FILENAME and NEWNAME must be absolute
file names."
(unless (memq op '(copy rename))
(error "Unknown operation ‘%s’, must be ‘copy’ or ‘rename’" op))
(error "Unknown operation `%s', must be `copy' or `rename'" op))
(let ((t1 (tramp-tramp-file-p filename))
(t2 (tramp-tramp-file-p newname))
......@@ -657,7 +657,7 @@ file names."
(goto-char (point-min))
(tramp-error-with-buffer
nil v 'file-error
"%s failed, see buffer ‘%s’ for details."
"%s failed, see buffer `%s' for details."
msg-operation (buffer-name)))
;; Some WebDAV server, like the one from QNAP, do not
......@@ -724,7 +724,7 @@ file names."
(with-current-buffer (tramp-get-connection-buffer v)
(goto-char (point-min))
(tramp-error-with-buffer
nil v 'file-error "Couldnt delete %s" directory)))))
nil v 'file-error "Couldn't delete %s" directory)))))
(defun tramp-gvfs-handle-delete-file (filename &optional trash)
"Like `delete-file' for Tramp files."
......@@ -739,7 +739,7 @@ file names."
(with-current-buffer (tramp-get-connection-buffer v)
(goto-char (point-min))
(tramp-error-with-buffer
nil v 'file-error "Couldnt delete %s" filename)))))
nil v 'file-error "Couldn't delete %s" filename)))))
(defun tramp-gvfs-handle-expand-file-name (name &optional dir)
"Like `expand-file-name' for Tramp files."
......@@ -765,7 +765,7 @@ file names."
(when (string-match "\\`\\(~[^/]*\\)\\(.*\\)\\'" localname)
(tramp-error
v 'file-error
"Cannot expand tilde in file ‘%s’" name))
"Cannot expand tilde in file `%s'" name))
(unless (tramp-run-real-handler 'file-name-absolute-p (list localname))
(setq localname (concat "/" localname)))
;; We do not pass "/..".
......@@ -927,7 +927,7 @@ file names."
(unless (file-exists-p filename)
(tramp-error
v 'file-error
"Cannot make local copy of non-existing file ‘%s’" filename))
"Cannot make local copy of non-existing file `%s'" filename))
(copy-file filename tmpfile t t)
tmpfile)))
......@@ -1013,7 +1013,7 @@ file names."
(tramp-error
v 'file-notify-error "gvfs-monitor-file failed to start")
(tramp-message
v 6 "Run ‘%s’, %S" (mapconcat 'identity (process-command p) " ") p)
v 6 "Run `%s', %S" (mapconcat 'identity (process-command p) " ") p)
(tramp-set-connection-property p "vector" v)
(tramp-compat-set-process-query-on-exit-flag p nil)
(set-process-filter p 'tramp-gvfs-file-gvfs-monitor-file-process-filter)
......@@ -1094,7 +1094,7 @@ file names."
;; Just do it.
(unless (tramp-gvfs-send-command
v "gvfs-mkdir" (tramp-gvfs-url-file-name dir))
(tramp-error v 'file-error "Couldnt make directory %s" dir))))))
(tramp-error v 'file-error "Couldn't make directory %s" dir))))))
(defun tramp-gvfs-handle-rename-file
(filename newname &optional ok-if-already-exists)
......@@ -1136,7 +1136,7 @@ file names."
(error
(delete-file tmpfile)
(tramp-error
v 'file-error "Couldn’t write region to ‘%s’" filename))))
v 'file-error "Couldn't write region to `%s'" filename))))
(tramp-flush-file-property v (file-name-directory localname))
(tramp-flush-file-property v localname)
......@@ -1175,7 +1175,7 @@ file names."
(url-hexify-string (file-truename filename)) nil nil t))))
(when (tramp-tramp-file-p filename)
(with-parsed-tramp-file-name filename nil
(tramp-message v 10 "remote file ‘%s’ is URL ‘%s’" filename result)))
(tramp-message v 10 "remote file `%s' is URL `%s'" filename result)))
result))
(defun tramp-gvfs-object-path (filename)
......
......@@ -95,7 +95,7 @@
"Delete auxiliary process when we are deleted."
(unless (memq (process-status proc) '(run open))
(tramp-message
tramp-gw-vector 4 "Deleting auxiliary process ‘%s’" tramp-gw-gw-proc)
tramp-gw-vector 4 "Deleting auxiliary process `%s'" tramp-gw-gw-proc)
(let* ((tramp-verbose 0)
(p (tramp-get-connection-property proc "process" nil)))
(when (processp p) (delete-process p)))))
......@@ -106,7 +106,7 @@
;; A new process has been spawned from `tramp-gw-aux-proc'.
(tramp-message
tramp-gw-vector 4
"Opening auxiliary process ‘%s’, speaking with process ‘%s’"
"Opening auxiliary process `%s', speaking with process `%s'"
proc tramp-gw-gw-proc)
(tramp-compat-set-process-query-on-exit-flag proc nil)
;; We don't want debug messages, because the corresponding debug
......@@ -160,7 +160,7 @@ instead of the host name declared in TARGET-VEC."
(set-process-sentinel tramp-gw-aux-proc 'tramp-gw-aux-proc-sentinel)
(tramp-compat-set-process-query-on-exit-flag tramp-gw-aux-proc nil)
(tramp-message
vec 4 "Opening auxiliary process ‘%s’, listening on port %d"
vec 4 "Opening auxiliary process `%s', listening on port %d"
tramp-gw-aux-proc (process-contact tramp-gw-aux-proc :service))))
(let* ((gw-method
......@@ -206,7 +206,7 @@ instead of the host name declared in TARGET-VEC."
(set-process-coding-system tramp-gw-gw-proc 'binary 'binary)
(tramp-compat-set-process-query-on-exit-flag tramp-gw-gw-proc nil)
(tramp-message
vec 4 "Opened %s process ‘%s’"
vec 4 "Opened %s process `%s'"
(case gw-method ('tunnel "HTTP tunnel") ('socks "SOCKS"))
tramp-gw-gw-proc)
......
This diff is collapsed.
......@@ -115,7 +115,7 @@ call, letting the SMB client use the default one."
"Read from server failed, maybe it closed the connection"
"Call timed out: server did not respond"
"\\S-+: command not found"
"Server doesnt support UNIX CIFS calls"
"Server doesn't support UNIX CIFS calls"
,(regexp-opt
'(;; Samba.
"ERRDOS"
......@@ -374,7 +374,7 @@ pass to the OPERATION."
(tramp-smb-get-localname v2)))
(tramp-error
v2 'file-error
"error with add-name-to-file, see buffer ‘%s’ for details"
"error with add-name-to-file, see buffer `%s' for details"
(buffer-name))))))
(defun tramp-smb-action-with-tar (proc vec)
......@@ -581,12 +581,12 @@ PRESERVE-UID-GID and PRESERVE-EXTENDED-ATTRIBUTES are completely ignored."
(tramp-flush-file-property v localname)
(unless (tramp-smb-get-share v)
(tramp-error
v 'file-error "Target ‘%s’ must contain a share name" newname))
v 'file-error "Target `%s' must contain a share name" newname))
(unless (tramp-smb-send-command
v (format "put \"%s\" \"%s\""
filename (tramp-smb-get-localname v)))
(tramp-error
v 'file-error "Cannot copy ‘%s’ to ‘%s’" filename newname))))))
v 'file-error "Cannot copy `%s' to `%s'" filename newname))))))
;; KEEP-DATE handling.
(when keep-date
......@@ -621,7 +621,7 @@ PRESERVE-UID-GID and PRESERVE-EXTENDED-ATTRIBUTES are completely ignored."
(goto-char (point-min))
(search-forward-regexp tramp-smb-errors nil t)
(tramp-error
v 'file-error "%s ‘%s’" (match-string 0) directory))))))
v 'file-error "%s `%s'" (match-string 0) directory))))))
(defun tramp-smb-handle-delete-file (filename &optional _trash)
"Like `delete-file' for Tramp files."
......@@ -642,7 +642,7 @@ PRESERVE-UID-GID and PRESERVE-EXTENDED-ATTRIBUTES are completely ignored."
(goto-char (point-min))
(search-forward-regexp tramp-smb-errors nil t)
(tramp-error
v 'file-error "%s ‘%s’" (match-string 0) filename))))))
v 'file-error "%s `%s'" (match-string 0) filename))))))
(defun tramp-smb-handle-directory-files
(directory &optional full match nosort)
......@@ -891,7 +891,7 @@ PRESERVE-UID-GID and PRESERVE-EXTENDED-ATTRIBUTES are completely ignored."
(unless (file-exists-p filename)
(tramp-error
v 'file-error
"Cannot make local copy of non-existing file ‘%s’" filename))
"Cannot make local copy of non-existing file `%s'" filename))
(let ((tmpfile (tramp-compat-make-temp-file filename)))
(with-tramp-progress-reporter
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."
;; Oops, an error. We shall cleanup.
(delete-file tmpfile)
(tramp-error
v 'file-error "Cannot make local copy of file ‘%s’" filename)))
v 'file-error "Cannot make local copy of file `%s'" filename)))
tmpfile)))
;; This function should return "foo/" for directories and "bar" for
......@@ -1055,7 +1055,7 @@ PRESERVE-UID-GID and PRESERVE-EXTENDED-ATTRIBUTES are completely ignored."
(when (file-directory-p ldir)
(make-directory-internal dir))
(unless (file-directory-p dir)
(tramp-error v 'file-error "Couldnt make directory %s" dir))))))
(tramp-error v 'file-error "Couldn't make directory %s" dir))))))
(defun tramp-smb-handle-make-directory-internal (directory)
"Like `make-directory-internal' for Tramp files."
......@@ -1079,7 +1079,7 @@ PRESERVE-UID-GID and PRESERVE-EXTENDED-ATTRIBUTES are completely ignored."
(tramp-flush-file-property v localname))
(unless (file-directory-p directory)
(tramp-error
v 'file-error "Couldnt make directory %s" directory))))))
v 'file-error "Couldn't make directory %s" directory))))))
(defun tramp-smb-handle-make-symbolic-link
(filename linkname &optional ok-if-already-exists)
......@@ -1130,7 +1130,7 @@ target of the symlink differ."
(tramp-smb-get-localname v2)))
(tramp-error
v2 'file-error
"error with make-symbolic-link, see buffer ‘%s’ for details"
"error with make-symbolic-link, see buffer `%s' for details"
(buffer-name))))))
(defun tramp-smb-handle-process-file
......@@ -1289,12 +1289,12 @@ target of the symlink differ."
(tramp-flush-file-property v2 v2-localname)
(unless (tramp-smb-get-share v2)
(tramp-error
v2 'file-error "Target ‘%s’ must contain a share name" newname))
v2 'file-error "Target `%s' must contain a share name" newname))
(unless (tramp-smb-send-command
v2 (format "rename \"%s\" \"%s\""
(tramp-smb-get-localname v1)
(tramp-smb-get-localname v2)))
(tramp-error v2 'file-error "Cannot rename ‘%s’" filename))))
(tramp-error v2 'file-error "Cannot rename `%s'" filename))))
;; We must rename via copy.
(tramp-compat-copy-file filename newname ok-if-already-exists t t t)
......@@ -1371,7 +1371,7 @@ target of the symlink differ."
(unless (re-search-backward "tramp_exit_status [0-9]+" nil t)
(tramp-error
v 'file-error
"Couldn’t find exit status of ‘%s’" tramp-smb-acl-program))
"Couldn't find exit status of `%s'" tramp-smb-acl-program))
(skip-chars-forward "^ ")
(when (zerop (read (current-buffer)))
;; Success.
......@@ -1392,7 +1392,7 @@ target of the symlink differ."
(tramp-smb-get-localname v)
(tramp-compat-decimal-to-octal mode)))
(tramp-error
v 'file-error "Error while changing files mode %s" filename)))))
v 'file-error "Error while changing file's mode %s" filename)))))
;; We use BUFFER also as connection buffer during setup. Because of
;; 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."
(unless (tramp-smb-send-command
v (format "put %s \"%s\""
tmpfile (tramp-smb-get-localname v)))
(tramp-error v 'file-error "Cannot write ‘%s’" filename))
(tramp-error v 'file-error "Cannot write `%s'" filename))
(delete-file tmpfile)))
(unless (equal curbuf (current-buffer))
(tramp-error
v 'file-error
"Buffer has changed from ‘%s’ to ‘%s’" curbuf (current-buffer)))
"Buffer has changed from `%s' to `%s'" curbuf (current-buffer)))
(when (eq visit t)
(set-visited-file-modtime)))))
......@@ -1563,7 +1563,7 @@ Result is a list of (LOCALNAME MODE SIZE MONTH DAY TIME YEAR)."
;; Loop the listing.
(goto-char (point-min))
(if (re-search-forward tramp-smb-errors nil t)
(tramp-error v 'file-error "%s ‘%s’" (match-string 0) directory)
(tramp-error v 'file-error "%s `%s'" (match-string 0) directory)
(while (not (eobp))
(setq entry (tramp-smb-read-file-entry share))
(forward-line)
......
......@@ -3094,7 +3094,7 @@ User is always nil."
v 'file-error "File `%s' not found on remote host" filename)
(with-tramp-progress-reporter
v 3 (format "Inserting `%s'" filename)
v 3 (format-message "Inserting `%s'" filename)
(condition-case err
(if (and (tramp-local-host-p v)
(let (file-name-handler-alist)
......@@ -3600,7 +3600,7 @@ connection buffer."
" `\\[tramp-cleanup-this-connection]'")))
((eq exit 'timeout)
(format-message
"Timeout reached, see buffer %s for details"
"Timeout reached, see buffer `%s' for details"
(tramp-get-connection-buffer vec)))
(t "Login failed")))))
(when (numberp pos)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment