diff options
| author | Michael Albinus | 2022-12-18 20:17:06 +0100 |
|---|---|---|
| committer | Michael Albinus | 2022-12-18 20:17:06 +0100 |
| commit | c1e015ae320c7ea0f9ca764b2df5fcd6f0d39994 (patch) | |
| tree | d630c64faa6a89e8ac08b2b7c7098ca509e0b3b9 | |
| parent | cf1b771864acb14bdf38d87187fcd8a4f7e4315a (diff) | |
| download | emacs-c1e015ae320c7ea0f9ca764b2df5fcd6f0d39994.tar.gz emacs-c1e015ae320c7ea0f9ca764b2df5fcd6f0d39994.zip | |
Fix recent change in tramp-smb.el
* lisp/net/tramp-smb.el (tramp-smb-file-name-handler-alist):
Ignore `make-directory-internal'.
(tramp-smb-handle-make-directory): Move implementation from
`tramp-smb-handle-make-directory-internal' here.
* lisp/net/tramp.el (tramp-file-name-for-operation):
Rearrange `make-directory-internal'.
| -rw-r--r-- | lisp/net/tramp-smb.el | 12 | ||||
| -rw-r--r-- | lisp/net/tramp.el | 6 |
2 files changed, 14 insertions, 4 deletions
diff --git a/lisp/net/tramp-smb.el b/lisp/net/tramp-smb.el index 24fff9bb495..cd73b9b8eca 100644 --- a/lisp/net/tramp-smb.el +++ b/lisp/net/tramp-smb.el | |||
| @@ -279,7 +279,7 @@ See `tramp-actions-before-shell' for more info.") | |||
| 279 | (lock-file . tramp-handle-lock-file) | 279 | (lock-file . tramp-handle-lock-file) |
| 280 | (make-auto-save-file-name . tramp-handle-make-auto-save-file-name) | 280 | (make-auto-save-file-name . tramp-handle-make-auto-save-file-name) |
| 281 | (make-directory . tramp-smb-handle-make-directory) | 281 | (make-directory . tramp-smb-handle-make-directory) |
| 282 | (make-directory-internal . tramp-smb-handle-make-directory-internal) | 282 | (make-directory-internal . ignore) |
| 283 | (make-lock-file-name . tramp-handle-make-lock-file-name) | 283 | (make-lock-file-name . tramp-handle-make-lock-file-name) |
| 284 | (make-nearby-temp-file . tramp-handle-make-nearby-temp-file) | 284 | (make-nearby-temp-file . tramp-handle-make-nearby-temp-file) |
| 285 | (make-process . ignore) | 285 | (make-process . ignore) |
| @@ -1186,10 +1186,18 @@ PRESERVE-UID-GID and PRESERVE-EXTENDED-ATTRIBUTES are completely ignored." | |||
| 1186 | (make-directory ldir parents)) | 1186 | (make-directory ldir parents)) |
| 1187 | ;; Just do it. | 1187 | ;; Just do it. |
| 1188 | (when (file-directory-p ldir) | 1188 | (when (file-directory-p ldir) |
| 1189 | (make-directory dir)) | 1189 | (tramp-smb-send-command |
| 1190 | v (if (tramp-smb-get-cifs-capabilities v) | ||
| 1191 | (format "posix_mkdir %s %o" | ||
| 1192 | (tramp-smb-shell-quote-localname v) (default-file-modes)) | ||
| 1193 | (format "mkdir %s" (tramp-smb-shell-quote-localname v)))) | ||
| 1194 | ;; We must also flush the cache of the directory, because | ||
| 1195 | ;; `file-attributes' reads the values from there. | ||
| 1196 | (tramp-flush-file-properties v localname)) | ||
| 1190 | (unless (file-directory-p dir) | 1197 | (unless (file-directory-p dir) |
| 1191 | (tramp-error v 'file-error "Couldn't make directory %s" dir))))) | 1198 | (tramp-error v 'file-error "Couldn't make directory %s" dir))))) |
| 1192 | 1199 | ||
| 1200 | ;; This is not used anymore. | ||
| 1193 | (defun tramp-smb-handle-make-directory-internal (directory) | 1201 | (defun tramp-smb-handle-make-directory-internal (directory) |
| 1194 | "Like `make-directory-internal' for Tramp files." | 1202 | "Like `make-directory-internal' for Tramp files." |
| 1195 | (declare (obsolete nil "29.1")) | 1203 | (declare (obsolete nil "29.1")) |
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 9b7117cb875..ca8963fbf54 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el | |||
| @@ -2605,12 +2605,14 @@ Must be handled by the callers." | |||
| 2605 | file-selinux-context file-symlink-p file-truename | 2605 | file-selinux-context file-symlink-p file-truename |
| 2606 | file-writable-p find-backup-file-name get-file-buffer | 2606 | file-writable-p find-backup-file-name get-file-buffer |
| 2607 | insert-directory insert-file-contents load | 2607 | insert-directory insert-file-contents load |
| 2608 | make-directory make-directory-internal set-file-acl | 2608 | make-directory set-file-acl set-file-modes |
| 2609 | set-file-modes set-file-selinux-context set-file-times | 2609 | set-file-selinux-context set-file-times |
| 2610 | substitute-in-file-name unhandled-file-name-directory | 2610 | substitute-in-file-name unhandled-file-name-directory |
| 2611 | vc-registered | 2611 | vc-registered |
| 2612 | ;; Emacs 27+ only. | 2612 | ;; Emacs 27+ only. |
| 2613 | file-system-info | 2613 | file-system-info |
| 2614 | ;; Emacs 28- only. | ||
| 2615 | make-directory-internal | ||
| 2614 | ;; Emacs 28+ only. | 2616 | ;; Emacs 28+ only. |
| 2615 | file-locked-p lock-file make-lock-file-name unlock-file | 2617 | file-locked-p lock-file make-lock-file-name unlock-file |
| 2616 | ;; Emacs 29+ only. | 2618 | ;; Emacs 29+ only. |