summaryrefslogtreecommitdiff
path: root/lisp/eshell/eshell.el
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2011-01-17 11:01:01 -0800
committerPaul Eggert <eggert@cs.ucla.edu>2011-01-17 11:01:01 -0800
commita3e44e793796153ff1534be9c74fcab50b45de30 (patch)
tree863d5db087c8e034c96d06ea955515f4d3f3d0a3 /lisp/eshell/eshell.el
parent7f818df9420a1320539f7e3e633003573a570413 (diff)
parent721be9cd4865e9f7d68020adcfa672d2edd52b07 (diff)
downloademacs-a3e44e793796153ff1534be9c74fcab50b45de30.tar.gz
emacs-a3e44e793796153ff1534be9c74fcab50b45de30.tar.bz2
emacs-a3e44e793796153ff1534be9c74fcab50b45de30.zip
Merge from mainline.
Diffstat (limited to 'lisp/eshell/eshell.el')
-rw-r--r--lisp/eshell/eshell.el1
1 files changed, 0 insertions, 1 deletions
diff --git a/lisp/eshell/eshell.el b/lisp/eshell/eshell.el
index 9e0c5b7bdb7..404c0db110b 100644
--- a/lisp/eshell/eshell.el
+++ b/lisp/eshell/eshell.el
@@ -491,5 +491,4 @@ Emacs."
(provide 'eshell)
-;; arch-tag: 9d4d5214-0e4e-4e02-b349-39add640d63f
;;; eshell.el ends here