From: Glenn Morris <rgm@gnu.org>
Date: Thu, 19 Sep 2013 06:56:47 +0000 (-0700)
Subject: * eshell/em-unix.el (eshell-remove-entries):
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~1520
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=72fd28777da23f5d3c67344e98a6477f0397316d;p=emacs.git

* 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 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))))