diff options
Diffstat (limited to 'lisp/eshell/em-unix.el')
| -rw-r--r-- | lisp/eshell/em-unix.el | 42 |
1 files changed, 18 insertions, 24 deletions
diff --git a/lisp/eshell/em-unix.el b/lisp/eshell/em-unix.el index 6ceb591e131..365f765433b 100644 --- a/lisp/eshell/em-unix.el +++ b/lisp/eshell/em-unix.el @@ -55,84 +55,84 @@ by name)." :group 'eshell-module) (defcustom eshell-unix-load-hook '(eshell-unix-initialize) - "*A list of functions to run when `eshell-unix' is loaded." + "A list of functions to run when `eshell-unix' is loaded." :type 'hook :group 'eshell-unix) (defcustom eshell-plain-grep-behavior nil - "*If non-nil, standalone \"grep\" commands will behave normally. + "If non-nil, standalone \"grep\" commands will behave normally. Standalone in this context means not redirected, and not on the receiving side of a command pipeline." :type 'boolean :group 'eshell-unix) (defcustom eshell-no-grep-available (not (eshell-search-path "grep")) - "*If non-nil, no grep is available on the current machine." + "If non-nil, no grep is available on the current machine." :type 'boolean :group 'eshell-unix) (defcustom eshell-plain-diff-behavior nil - "*If non-nil, standalone \"diff\" commands will behave normally. + "If non-nil, standalone \"diff\" commands will behave normally. Standalone in this context means not redirected, and not on the receiving side of a command pipeline." :type 'boolean :group 'eshell-unix) (defcustom eshell-plain-locate-behavior (featurep 'xemacs) - "*If non-nil, standalone \"locate\" commands will behave normally. + "If non-nil, standalone \"locate\" commands will behave normally. Standalone in this context means not redirected, and not on the receiving side of a command pipeline." :type 'boolean :group 'eshell-unix) (defcustom eshell-rm-removes-directories nil - "*If non-nil, `rm' will remove directory entries. + "If non-nil, `rm' will remove directory entries. Otherwise, `rmdir' is required." :type 'boolean :group 'eshell-unix) (defcustom eshell-rm-interactive-query (= (user-uid) 0) - "*If non-nil, `rm' will query before removing anything." + "If non-nil, `rm' will query before removing anything." :type 'boolean :group 'eshell-unix) (defcustom eshell-mv-interactive-query (= (user-uid) 0) - "*If non-nil, `mv' will query before overwriting anything." + "If non-nil, `mv' will query before overwriting anything." :type 'boolean :group 'eshell-unix) (defcustom eshell-mv-overwrite-files t - "*If non-nil, `mv' will overwrite files without warning." + "If non-nil, `mv' will overwrite files without warning." :type 'boolean :group 'eshell-unix) (defcustom eshell-cp-interactive-query (= (user-uid) 0) - "*If non-nil, `cp' will query before overwriting anything." + "If non-nil, `cp' will query before overwriting anything." :type 'boolean :group 'eshell-unix) (defcustom eshell-cp-overwrite-files t - "*If non-nil, `cp' will overwrite files without warning." + "If non-nil, `cp' will overwrite files without warning." :type 'boolean :group 'eshell-unix) (defcustom eshell-ln-interactive-query (= (user-uid) 0) - "*If non-nil, `ln' will query before overwriting anything." + "If non-nil, `ln' will query before overwriting anything." :type 'boolean :group 'eshell-unix) (defcustom eshell-ln-overwrite-files nil - "*If non-nil, `ln' will overwrite files without warning." + "If non-nil, `ln' will overwrite files without warning." :type 'boolean :group 'eshell-unix) (defcustom eshell-default-target-is-dot nil - "*If non-nil, the default destination for cp, mv or ln is `.'." + "If non-nil, the default destination for cp, mv or ln is `.'." :type 'boolean :group 'eshell-unix) (defcustom eshell-du-prefer-over-ange nil - "*Use Eshell's du in ange-ftp remote directories. + "Use Eshell's du in ange-ftp remote directories. Otherwise, Emacs will attempt to use rsh to invoke du on the remote machine." :type 'boolean :group 'eshell-unix) @@ -203,13 +203,7 @@ Otherwise, Emacs will attempt to use rsh to invoke du on the remote machine." (eshell-error "rm: cannot remove `.' or `..'\n")) (if (and (file-directory-p (car files)) (not (file-symlink-p (car files)))) - (let ((dir (file-name-as-directory (car files)))) - (eshell-remove-entries dir - (mapcar - (function - (lambda (file) - (concat dir file))) - (directory-files dir))) + (progn (if verbose (eshell-printn (format "rm: removing directory `%s'" (car files)))) @@ -219,7 +213,7 @@ Otherwise, Emacs will attempt to use rsh to invoke du on the remote machine." (not (y-or-n-p (format "rm: remove directory `%s'? " (car files)))))) - (eshell-funcalln 'delete-directory (car files)))) + (eshell-funcalln 'delete-directory (car files) t t))) (if verbose (eshell-printn (format "rm: removing file `%s'" (car files)))) @@ -228,7 +222,7 @@ Otherwise, Emacs will attempt to use rsh to invoke du on the remote machine." (not (y-or-n-p (format "rm: remove `%s'? " (car files)))))) - (eshell-funcalln 'delete-file (car files))))) + (eshell-funcalln 'delete-file (car files) t)))) (setq files (cdr files)))) (defun eshell/rm (&rest args) |