diff options
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/eshell/em-unix.el | 8 |
2 files changed, 7 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 29c32718f89..ed6bf661e26 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,8 @@ | |||
| 1 | 2013-09-19 Glenn Morris <rgm@gnu.org> | 1 | 2013-09-19 Glenn Morris <rgm@gnu.org> |
| 2 | 2 | ||
| 3 | * eshell/em-unix.el (eshell-remove-entries): | ||
| 4 | Remove unused arg `path'. Update callers. | ||
| 5 | |||
| 3 | * eshell/em-hist.el (eshell-hist-parse-arguments): | 6 | * eshell/em-hist.el (eshell-hist-parse-arguments): |
| 4 | Remove unused arg `silent'. Update callers. | 7 | Remove unused arg `silent'. Update callers. |
| 5 | 8 | ||
diff --git a/lisp/eshell/em-unix.el b/lisp/eshell/em-unix.el index 1548d181855..c278532f349 100644 --- a/lisp/eshell/em-unix.el +++ b/lisp/eshell/em-unix.el | |||
| @@ -195,8 +195,8 @@ Otherwise, Emacs will attempt to use rsh to invoke du on the remote machine." | |||
| 195 | (Info-menu (car args)) | 195 | (Info-menu (car args)) |
| 196 | (setq args (cdr args))))) | 196 | (setq args (cdr args))))) |
| 197 | 197 | ||
| 198 | (defun eshell-remove-entries (path files &optional top-level) | 198 | (defun eshell-remove-entries (files &optional top-level) |
| 199 | "From PATH, remove all of the given FILES, perhaps interactively." | 199 | "Remove all of the given FILES, perhaps interactively." |
| 200 | (while files | 200 | (while files |
| 201 | (if (string-match "\\`\\.\\.?\\'" | 201 | (if (string-match "\\`\\.\\.?\\'" |
| 202 | (file-name-nondirectory (car files))) | 202 | (file-name-nondirectory (car files))) |
| @@ -296,9 +296,9 @@ Remove (unlink) the FILE(s).") | |||
| 296 | (y-or-n-p | 296 | (y-or-n-p |
| 297 | (format "rm: descend into directory `%s'? " | 297 | (format "rm: descend into directory `%s'? " |
| 298 | entry))) | 298 | entry))) |
| 299 | (eshell-remove-entries nil (list entry) t)) | 299 | (eshell-remove-entries (list entry) t)) |
| 300 | (eshell-error (format "rm: %s: is a directory\n" entry))) | 300 | (eshell-error (format "rm: %s: is a directory\n" entry))) |
| 301 | (eshell-remove-entries nil (list entry) t)))))) | 301 | (eshell-remove-entries (list entry) t)))))) |
| 302 | (setq args (cdr args))) | 302 | (setq args (cdr args))) |
| 303 | nil)) | 303 | nil)) |
| 304 | 304 | ||