Commit 1a601680 authored by Stefan Monnier's avatar Stefan Monnier
Browse files

* lisp/eshell/esh-proc.el (eshell/kill): Fix last change.

* lisp/eshell/em-ls.el (eshell-ls-dir): Fix use of CL in last change.
parent 276a61a6
2013-02-08 Stefan Monnier <monnier@iro.umontreal.ca>
* eshell/esh-proc.el (eshell/kill): Fix last change.
* eshell/em-ls.el (eshell-ls-dir): Fix use of CL in last change.
2013-02-08 Aidan Gauland <aidalgol@no8wireless.co.nz>
 
* eshell/esh-proc.el (eshell/kill): Rewrite.
......
......@@ -26,9 +26,8 @@
;;; Code:
(eval-when-compile
(require 'cl-lib)
(require 'eshell))
(eval-when-compile (require 'eshell))
(require 'cl-lib)
(require 'esh-util)
(require 'esh-opt)
......@@ -564,11 +563,9 @@ relative to that directory."
(when (and show-almost-all
(not show-all))
(setq entries
(remove-if
(cl-remove-if
(lambda (entry)
(let ((filename (caar entry)))
(or (string= filename ".")
(string= filename ".."))))
(member (caar entry) '("." "..")))
entries)))
(when (and (not show-all)
eshell-ls-exclude-regexp)
......
......@@ -170,33 +170,32 @@ Usage: kill [-<signal>] <pid>|<process> ...
Accepts PIDs and process objects."
;; If the first argument starts with a dash, treat it as the signal
;; specifier.
(let ((signum 'SIGINT))
(let ((arg (car args))
(case-fold-search nil))
(when (stringp arg)
(cond
((string-match "^-[[:digit:]]+$" arg)
(setq signum (abs (string-to-number arg)))
((or (string-match "^-[[:upper:]]+$" arg)
(string-match "^-[[:lower:]]+$" arg))
(setq signum (abs (string-to-number arg))))))
(setq args (cdr args))))
(while args
(let ((arg (if (eshell-processp (car args))
(process-id (car args))
(car args))))
(when arg
(cond
((null arg)
(error "kill: null pid. Process may actually be a network connection."))
((not (numberp arg))
(error "kill: invalid argument type: %s" (type-of arg)))
((and (numberp arg)
(<= arg 0))
(error "kill: bad pid: %d" arg))
(t
(signal-process arg signum)))))
(setq args (cdr args))))
(let ((signum 'SIGINT))
(let ((arg (car args))
(case-fold-search nil))
(when (stringp arg)
(cond
((string-match "\\`-[[:digit:]]+\\'" arg)
(setq signum (abs (string-to-number arg))))
((string-match "\\`-\\([[:upper:]]+\\|[[:lower:]]+\\)\\'" arg)
(setq signum (abs (string-to-number arg)))))
(setq args (cdr args))))
(while args
(let ((arg (if (eshell-processp (car args))
(process-id (car args))
(car args))))
(when arg
(cond
((null arg)
(error "kill: null pid. Process may actually be a network connection."))
((not (numberp arg))
(error "kill: invalid argument type: %s" (type-of arg)))
((and (numberp arg)
(<= arg 0))
(error "kill: bad pid: %d" arg))
(t
(signal-process arg signum)))))
(setq args (cdr args))))
nil)
(defun eshell-read-process-name (prompt)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment