diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2011-01-14 12:18:41 -0500 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2011-01-14 12:18:41 -0500 |
| commit | 77ab81d0545e980c57c0a35510ade29a9e43b4cd (patch) | |
| tree | 258514dac7faab41642d8f319eb113c8a5f09690 /lisp/shell.el | |
| parent | 8faba62c38f67693535c3471d867e66757b3b04e (diff) | |
| parent | fb724e553757e9d3344be443ab5f329afc9bf91c (diff) | |
| download | emacs-77ab81d0545e980c57c0a35510ade29a9e43b4cd.tar.gz | |
Merge from emacs-23
Diffstat (limited to 'lisp/shell.el')
| -rw-r--r-- | lisp/shell.el | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lisp/shell.el b/lisp/shell.el index 815add76502..57cc11f9d4f 100644 --- a/lisp/shell.el +++ b/lisp/shell.el @@ -1,8 +1,7 @@ ;;; shell.el --- specialized comint.el for running the shell -;; Copyright (C) 1988, 1993, 1994, 1995, 1996, 1997, 2000, 2001, 2002, -;; 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 -;; Free Software Foundation, Inc. +;; Copyright (C) 1988, 1993, 1994, 1995, 1996, 1997, 2000, 2001, +;; 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. ;; Author: Olin Shivers <shivers@cs.cmu.edu> ;; Simon Marshall <simon@gnu.org> |