* eshell/em-unix.el (eshell-remove-entries):

Rename argument to avoid name-clash with global `top-level'.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 97b22964601a02d00a40819804c0ba878f7acbb2..e6eeca49d664922be555e50a28b9eaca6589a65a 100644 (file)
--- 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 c278532f3494d3fa7679eab00ed881174c2271ab..1cf40d58a49c4bcafd2c341db4b1d6cf33a0d6a2 100644 (file)
--- 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))))