[Emacs-diffs] trunk r114389: * eshell/em-unix.el (eshell-remove-entries):

[Glenn Morris]

------------------------------------------------------------
revno: 114389
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2013-09-18 23:56:47 -0700
message:
  * eshell/em-unix.el (eshell-remove-entries):
  Rename argument to avoid name-clash with global `top-level'.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/eshell/em-unix.el         emunix.el-20091113204419-o5vbwnq5f7feedwu-1865

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-09-19 03:44:55 +0000
+++ b/lisp/ChangeLog    2013-09-19 06:56:47 +0000
@@ -1,5 +1,8 @@
 2013-09-19  Glenn Morris  <address@hidden>
 
+       * 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'.

=== modified file 'lisp/eshell/em-unix.el'
--- a/lisp/eshell/em-unix.el    2013-09-19 02:42:36 +0000
+++ b/lisp/eshell/em-unix.el    2013-09-19 06:56:47 +0000
@@ -195,12 +195,12 @@
       (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))))