mirror of
https://github.com/masscollaborationlabs/emacs.git
synced 2025-07-10 14:10:51 +00:00
Merge branch 'emacs-28' of git.savannah.gnu.org:/srv/git/emacs into emacs-28
This commit is contained in:
commit
0ad8cd40ce
3 changed files with 10 additions and 15 deletions
|
@ -178,6 +178,12 @@ files.
|
||||||
Skip the next @samp{N} characters (@pxref{Comments}). This is used in
|
Skip the next @samp{N} characters (@pxref{Comments}). This is used in
|
||||||
byte-compiled files, and is not meant to be used in Emacs Lisp source
|
byte-compiled files, and is not meant to be used in Emacs Lisp source
|
||||||
files.
|
files.
|
||||||
|
|
||||||
|
@item #f
|
||||||
|
Indicates that the following form isn't readable by the Emacs Lisp
|
||||||
|
reader. This is only in text for display purposes (when that would
|
||||||
|
look prettier than alternative ways of indicating an unreadable form)
|
||||||
|
and will never appear in any Lisp file.
|
||||||
@end table
|
@end table
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -1631,7 +1631,7 @@ errors for shares like \"C$/\", which are common in Microsoft Windows."
|
||||||
v 3 (format "Moving tmp file %s to %s" tmpfile filename)
|
v 3 (format "Moving tmp file %s to %s" tmpfile filename)
|
||||||
(unwind-protect
|
(unwind-protect
|
||||||
(unless (tramp-smb-send-command
|
(unless (tramp-smb-send-command
|
||||||
v (format "put %s \"%s\""
|
v (format "put \"%s\" \"%s\""
|
||||||
tmpfile (tramp-smb-get-localname v)))
|
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)))
|
(delete-file tmpfile)))
|
||||||
|
@ -1695,9 +1695,8 @@ If VEC has no cifs capabilities, exchange \"/\" by \"\\\\\"."
|
||||||
(when (string-match "\\(\\$\\$\\)\\(/\\|$\\)" localname)
|
(when (string-match "\\(\\$\\$\\)\\(/\\|$\\)" localname)
|
||||||
(setq localname (replace-match "$" nil nil localname 1)))
|
(setq localname (replace-match "$" nil nil localname 1)))
|
||||||
|
|
||||||
;; A period followed by a space, or trailing periods and spaces,
|
;; A trailing space is not supported.
|
||||||
;; are not supported.
|
(when (string-match-p " $" localname)
|
||||||
(when (string-match-p "\\. \\|\\.$\\| $" localname)
|
|
||||||
(tramp-error
|
(tramp-error
|
||||||
vec 'file-error
|
vec 'file-error
|
||||||
"Invalid file name %s" (tramp-make-tramp-file-name vec localname)))
|
"Invalid file name %s" (tramp-make-tramp-file-name vec localname)))
|
||||||
|
|
|
@ -2028,17 +2028,7 @@ Also see `ignore'."
|
||||||
:type 'user-error)
|
:type 'user-error)
|
||||||
(should-error
|
(should-error
|
||||||
(expand-file-name "/method:user1@host1|ssh:user2@host2:/path/to/file")
|
(expand-file-name "/method:user1@host1|ssh:user2@host2:/path/to/file")
|
||||||
:type 'user-error))
|
:type 'user-error)))
|
||||||
|
|
||||||
;; Samba does not support file names with periods followed by
|
|
||||||
;; spaces, and trailing periods or spaces.
|
|
||||||
(when (tramp--test-smb-p)
|
|
||||||
(dolist (file '("foo." "foo. bar" "foo "))
|
|
||||||
(should-error
|
|
||||||
(tramp-smb-get-localname
|
|
||||||
(tramp-dissect-file-name
|
|
||||||
(expand-file-name file tramp-test-temporary-file-directory)))
|
|
||||||
:type 'file-error))))
|
|
||||||
|
|
||||||
(ert-deftest tramp-test04-substitute-in-file-name ()
|
(ert-deftest tramp-test04-substitute-in-file-name ()
|
||||||
"Check `substitute-in-file-name'."
|
"Check `substitute-in-file-name'."
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue