comparison lisp/shell.el @ 112228:417b1e4d63cd

Merge from emacs-23
author Stefan Monnier <monnier@iro.umontreal.ca>
date Fri, 14 Jan 2011 12:18:41 -0500
parents ce132c9fdaf1 376148b31b5e
children 61f7601898b1
comparison
equal deleted inserted replaced
112227:07e52ed69b5d 112228:417b1e4d63cd
1 ;;; shell.el --- specialized comint.el for running the shell 1 ;;; shell.el --- specialized comint.el for running the shell
2 2
3 ;; Copyright (C) 1988, 1993, 1994, 1995, 1996, 1997, 2000, 2001, 2002, 3 ;; Copyright (C) 1988, 1993, 1994, 1995, 1996, 1997, 2000, 2001,
4 ;; 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 4 ;; 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
5 ;; Free Software Foundation, Inc.
6 5
7 ;; Author: Olin Shivers <shivers@cs.cmu.edu> 6 ;; Author: Olin Shivers <shivers@cs.cmu.edu>
8 ;; Simon Marshall <simon@gnu.org> 7 ;; Simon Marshall <simon@gnu.org>
9 ;; Maintainer: FSF <emacs-devel@gnu.org> 8 ;; Maintainer: FSF <emacs-devel@gnu.org>
10 ;; Keywords: processes 9 ;; Keywords: processes