aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/eshell
diff options
context:
space:
mode:
authorGlenn Morris2008-08-13 03:12:49 +0000
committerGlenn Morris2008-08-13 03:12:49 +0000
commitc1043701f647fefd3975bc05191308e09edd42a4 (patch)
treee483d6f30a109a39dfc358ce58109131cc5c67a1 /lisp/eshell
parent05d1da31b577a38fc30b1d879aad17899ab98c40 (diff)
downloademacs-c1043701f647fefd3975bc05191308e09edd42a4.tar.gz
emacs-c1043701f647fefd3975bc05191308e09edd42a4.zip
(eshell/which): Handle the case where no description is found.
Diffstat (limited to 'lisp/eshell')
-rw-r--r--lisp/eshell/esh-cmd.el9
1 files changed, 6 insertions, 3 deletions
diff --git a/lisp/eshell/esh-cmd.el b/lisp/eshell/esh-cmd.el
index 82619d60791..17ae50d1f50 100644
--- a/lisp/eshell/esh-cmd.el
+++ b/lisp/eshell/esh-cmd.el
@@ -1252,9 +1252,12 @@ be finished later after the completion of an asynchronous subprocess."
1252 (prog1 1252 (prog1
1253 (describe-function sym) 1253 (describe-function sym)
1254 (message nil)))))) 1254 (message nil))))))
1255 (setq desc (substring desc 0 1255 (setq desc (if desc (substring desc 0
1256 (1- (or (string-match "\n" desc) 1256 (1- (or (string-match "\n" desc)
1257 (length desc))))) 1257 (length desc))))
1258 ;; This should not happen.
1259 (format "%s is defined, \
1260but no documentation was found" name)))
1258 (if (buffer-live-p (get-buffer "*Help*")) 1261 (if (buffer-live-p (get-buffer "*Help*"))
1259 (kill-buffer "*Help*")) 1262 (kill-buffer "*Help*"))
1260 (setq program (or desc name)))))) 1263 (setq program (or desc name))))))