Mercurial > emacs
comparison lisp/net/tramp-smb.el @ 108887:2c20a51413cb
* net/tramp-gvfs.el (tramp-gvfs-handle-expand-file-name): Expand "~/".
(tramp-gvfs-handler-mounted-unmounted)
(tramp-gvfs-connection-mounted-p): Handle default-location.
* net/tramp-smb.el (tramp-smb-handle-delete-directory): Don't try to
move files to trash.
| author | Michael Albinus <michael.albinus@gmx.de> |
|---|---|
| date | Fri, 04 Jun 2010 13:26:54 +0200 |
| parents | 94d1d8a6dcfd |
| children | 280c8ae2476d |
comparison
equal
deleted
inserted
replaced
| 108886:0ed39249e8e4 | 108887:2c20a51413cb |
|---|---|
| 380 (if recursive | 380 (if recursive |
| 381 (mapc | 381 (mapc |
| 382 (lambda (file) | 382 (lambda (file) |
| 383 (if (file-directory-p file) | 383 (if (file-directory-p file) |
| 384 (tramp-compat-delete-directory file recursive) | 384 (tramp-compat-delete-directory file recursive) |
| 385 (tramp-compat-delete-file file 'trash))) | 385 (delete-file file))) |
| 386 ;; We do not want to delete "." and "..". | 386 ;; We do not want to delete "." and "..". |
| 387 (directory-files | 387 (directory-files |
| 388 directory 'full "^\\([^.]\\|\\.\\([^.]\\|\\..\\)\\).*"))) | 388 directory 'full "^\\([^.]\\|\\.\\([^.]\\|\\..\\)\\).*"))) |
| 389 | 389 |
| 390 (with-parsed-tramp-file-name directory nil | 390 (with-parsed-tramp-file-name directory nil |