Mercurial > emacs

diff lisp/net/tramp-smb.el @ 108887:2c20a51413cb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* 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
line wrap: on
line diff
--- a/lisp/net/tramp-smb.el	Fri Jun 04 03:38:12 2010 +0200
+++ b/lisp/net/tramp-smb.el	Fri Jun 04 13:26:54 2010 +0200
@@ -382,7 +382,7 @@
 	 (lambda (file)
 	   (if (file-directory-p file)
 	       (tramp-compat-delete-directory file recursive)
-	     (tramp-compat-delete-file file 'trash)))
+	     (delete-file file)))
 	 ;; We do not want to delete "." and "..".
 	 (directory-files
 	  directory 'full "^\\([^.]\\|\\.\\([^.]\\|\\..\\)\\).*")))