diff options
| author | Glenn Morris <rgm@gnu.org> | 2013-09-18 23:56:47 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2013-09-18 23:56:47 -0700 |
| commit | 72fd28777da23f5d3c67344e98a6477f0397316d (patch) | |
| tree | fb8e5395ff06e90b0eb8713c904ee81bbcb9e4eb | |
| parent | 091f1e1f29214ab169d60f1f82f1346c1742743b (diff) | |
| download | emacs-72fd28777da23f5d3c67344e98a6477f0397316d.tar.gz | |
* eshell/em-unix.el (eshell-remove-entries):
Rename argument to avoid name-clash with global `top-level'.
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/eshell/em-unix.el | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 97b22964601..e6eeca49d66 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2013-09-19 Glenn Morris <rgm@gnu.org> + * eshell/em-unix.el (eshell-remove-entries): + Rename argument to avoid name-clash with global `top-level'. + * eshell/esh-proc.el (eshell-kill-process-function): Remove eshell-reset-after-proc from eshell-kill-hook if present. (eshell-reset-after-proc): Remove unused arg `proc'. diff --git a/lisp/eshell/em-unix.el b/lisp/eshell/em-unix.el index c278532f349..1cf40d58a49 100644 --- a/lisp/eshell/em-unix.el +++ b/lisp/eshell/em-unix.el @@ -195,12 +195,12 @@ Otherwise, Emacs will attempt to use rsh to invoke du on the remote machine." (Info-menu (car args)) (setq args (cdr args))))) -(defun eshell-remove-entries (files &optional top-level) +(defun eshell-remove-entries (files &optional toplevel) "Remove all of the given FILES, perhaps interactively." (while files (if (string-match "\\`\\.\\.?\\'" (file-name-nondirectory (car files))) - (if top-level + (if toplevel (eshell-error "rm: cannot remove `.' or `..'\n")) (if (and (file-directory-p (car files)) (not (file-symlink-p (car files)))) |