diff options
| author | Joakim Verona | 2011-02-05 11:23:09 +0100 |
|---|---|---|
| committer | Joakim Verona | 2011-02-05 11:23:09 +0100 |
| commit | 4bd51ad5c3445b644dfb017d5b57b10a90aa325f (patch) | |
| tree | 894801e7308ce4ecc34933f959e28f4b9cff9533 /lisp/eshell/em-basic.el | |
| parent | 13cfe8df462ab8da9f0028e16cc84dcaceaca3d1 (diff) | |
| parent | 9bcaafce5351d270ac514e23cb69ff1a5fd35229 (diff) | |
| download | emacs-4bd51ad5c3445b644dfb017d5b57b10a90aa325f.tar.gz emacs-4bd51ad5c3445b644dfb017d5b57b10a90aa325f.zip | |
merge from upstream. currently seems to have bitroted and i get segfaults
Diffstat (limited to 'lisp/eshell/em-basic.el')
| -rw-r--r-- | lisp/eshell/em-basic.el | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/lisp/eshell/em-basic.el b/lisp/eshell/em-basic.el index ce72f752d42..df1987e13ee 100644 --- a/lisp/eshell/em-basic.el +++ b/lisp/eshell/em-basic.el | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | ;;; em-basic.el --- basic shell builtin commands | 1 | ;;; em-basic.el --- basic shell builtin commands |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, | 3 | ;; Copyright (C) 1999-2011 Free Software Foundation, Inc. |
| 4 | ;; 2008, 2009, 2010 Free Software Foundation, Inc. | ||
| 5 | 4 | ||
| 6 | ;; Author: John Wiegley <johnw@gnu.org> | 5 | ;; Author: John Wiegley <johnw@gnu.org> |
| 7 | 6 | ||
| @@ -184,5 +183,4 @@ or `eshell-printn' for display." | |||
| 184 | ;; generated-autoload-file: "esh-groups.el" | 183 | ;; generated-autoload-file: "esh-groups.el" |
| 185 | ;; End: | 184 | ;; End: |
| 186 | 185 | ||
| 187 | ;; arch-tag: 385a31b1-cb95-46f0-9829-9d352ee77db8 | ||
| 188 | ;;; em-basic.el ends here | 186 | ;;; em-basic.el ends here |