Merge from emacs-23

[gnu-emacs] / lisp / eshell / em-prompt.el

diff --git a/lisp/eshell/em-prompt.el b/lisp/eshell/em-prompt.el
index 29e1ace26b18df8f92ba22134bef52aaffe9e857..d7adaac90341c03896109e5e6354a8eecbe9022a 100644 (file)
--- a/lisp/eshell/em-prompt.el
+++ b/lisp/eshell/em-prompt.el
@@ -1,7 +1,7 @@
 ;;; em-prompt.el --- command prompts
 
 ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-;;   2008, 2009, 2010  Free Software Foundation, Inc.
+;;   2008, 2009, 2010, 2011  Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>