diff options
| author | Andrea Corallo <akrl@sdf.org> | 2020-06-27 21:42:16 +0100 |
|---|---|---|
| committer | Andrea Corallo <akrl@sdf.org> | 2020-06-27 21:42:16 +0100 |
| commit | 0eedb5af0b9f505dda9418323c74e992a40e5585 (patch) | |
| tree | 9ef1315ecb577c36b062e8b3cb7a7c1bed6fd426 /lisp/net | |
| parent | 24f68d6bfc83b5514d928853ffd86b97c53e1623 (diff) | |
| parent | 118c07e02e939c9f52688091509d4bff2a897032 (diff) | |
| download | emacs-0eedb5af0b9f505dda9418323c74e992a40e5585.tar.gz emacs-0eedb5af0b9f505dda9418323c74e992a40e5585.tar.bz2 emacs-0eedb5af0b9f505dda9418323c74e992a40e5585.zip | |
Merge remote-tracking branch 'savannah/master' into HEAD
Diffstat (limited to 'lisp/net')
| -rw-r--r-- | lisp/net/tramp-smb.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/net/tramp-smb.el b/lisp/net/tramp-smb.el index 357e9a220ce..947e6a767c7 100644 --- a/lisp/net/tramp-smb.el +++ b/lisp/net/tramp-smb.el @@ -704,11 +704,11 @@ PRESERVE-UID-GID and PRESERVE-EXTENDED-ATTRIBUTES are completely ignored." (delete nil (mapcar (lambda (x) (when (string-match-p match x) x)) result)))) - ;; Append directory. + ;; Prepend directory. (when full (setq result (mapcar - (lambda (x) (format "%s/%s" directory x)) + (lambda (x) (format "%s/%s" (directory-file-name directory) x)) result))) ;; Sort them if necessary. (unless nosort (setq result (sort result #'string-lessp))) |