[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r111695: * lisp/eshell/esh-proc.el (e
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r111695: * lisp/eshell/esh-proc.el (eshell/kill): Fix last change. |
Date: |
Fri, 08 Feb 2013 10:47:07 -0500 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 111695
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Fri 2013-02-08 10:47:07 -0500
message:
* 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.
modified:
lisp/ChangeLog
lisp/eshell/em-ls.el
lisp/eshell/esh-proc.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2013-02-08 15:07:03 +0000
+++ b/lisp/ChangeLog 2013-02-08 15:47:07 +0000
@@ -1,3 +1,8 @@
+2013-02-08 Stefan Monnier <address@hidden>
+
+ * 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 <address@hidden>
* eshell/esh-proc.el (eshell/kill): Rewrite.
=== modified file 'lisp/eshell/em-ls.el'
--- a/lisp/eshell/em-ls.el 2013-02-08 15:07:03 +0000
+++ b/lisp/eshell/em-ls.el 2013-02-08 15:47:07 +0000
@@ -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 @@
(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)
=== modified file 'lisp/eshell/esh-proc.el'
--- a/lisp/eshell/esh-proc.el 2013-02-08 15:07:03 +0000
+++ b/lisp/eshell/esh-proc.el 2013-02-08 15:47:07 +0000
@@ -170,33 +170,32 @@
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)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r111695: * lisp/eshell/esh-proc.el (eshell/kill): Fix last change.,
Stefan Monnier <=