aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/eshell
diff options
context:
space:
mode:
authorEli Zaretskii2010-02-27 07:43:30 -0500
committerEli Zaretskii2010-02-27 07:43:30 -0500
commitd23cd5eeb2993e55943d250ea8c2015da5b06a24 (patch)
tree2b3eac653fd6869f83179e393a467d81f6421cf9 /lisp/eshell
parent918f41599dfab54071920441d86c306ced83b550 (diff)
parent8ff35869753b7ef1bd479d99fe685a47fa6b73ed (diff)
downloademacs-d23cd5eeb2993e55943d250ea8c2015da5b06a24.tar.gz
emacs-d23cd5eeb2993e55943d250ea8c2015da5b06a24.zip
Merge frome mainline.
Diffstat (limited to 'lisp/eshell')
-rw-r--r--lisp/eshell/eshell.el9
1 files changed, 4 insertions, 5 deletions
diff --git a/lisp/eshell/eshell.el b/lisp/eshell/eshell.el
index 9a4874614ce..74f65d2fe55 100644
--- a/lisp/eshell/eshell.el
+++ b/lisp/eshell/eshell.el
@@ -229,11 +229,10 @@
229(require 'esh-mode) 229(require 'esh-mode)
230 230
231(defgroup eshell nil 231(defgroup eshell nil
232 "Eshell is a command shell implemented entirely in Emacs Lisp. It 232 "A command shell implemented entirely in Emacs Lisp.
233invokes no external processes beyond those requested by the user. It 233It invokes no external processes beyond those requested by the
234is intended to be a functional replacement for command shells such as 234user, and is intended to be a functional replacement for command
235bash, zsh, rc, 4dos; since Emacs itself is capable of handling most of 235shells such as bash, zsh, rc, 4dos."
236the tasks accomplished by such tools."
237 :tag "The Emacs shell" 236 :tag "The Emacs shell"
238 :link '(info-link "(eshell)Top") 237 :link '(info-link "(eshell)Top")
239 :version "21.1" 238 :version "21.1"