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/eshell | |
parent | 8faba62c38f67693535c3471d867e66757b3b04e (diff) | |
parent | fb724e553757e9d3344be443ab5f329afc9bf91c (diff) | |
download | emacs-77ab81d0545e980c57c0a35510ade29a9e43b4cd.tar.gz |
Merge from emacs-23
Diffstat (limited to 'lisp/eshell')
-rw-r--r-- | lisp/eshell/em-alias.el | 2 | ||||
-rw-r--r-- | lisp/eshell/em-banner.el | 2 | ||||
-rw-r--r-- | lisp/eshell/em-basic.el | 2 | ||||
-rw-r--r-- | lisp/eshell/em-cmpl.el | 2 | ||||
-rw-r--r-- | lisp/eshell/em-dirs.el | 2 | ||||
-rw-r--r-- | lisp/eshell/em-glob.el | 2 | ||||
-rw-r--r-- | lisp/eshell/em-hist.el | 2 | ||||
-rw-r--r-- | lisp/eshell/em-ls.el | 2 | ||||
-rw-r--r-- | lisp/eshell/em-pred.el | 2 | ||||
-rw-r--r-- | lisp/eshell/em-prompt.el | 2 | ||||
-rw-r--r-- | lisp/eshell/em-rebind.el | 2 | ||||
-rw-r--r-- | lisp/eshell/em-script.el | 2 | ||||
-rw-r--r-- | lisp/eshell/em-smart.el | 2 | ||||
-rw-r--r-- | lisp/eshell/em-term.el | 2 | ||||
-rw-r--r-- | lisp/eshell/em-unix.el | 2 | ||||
-rw-r--r-- | lisp/eshell/em-xtra.el | 2 | ||||
-rw-r--r-- | lisp/eshell/esh-arg.el | 2 | ||||
-rw-r--r-- | lisp/eshell/esh-cmd.el | 2 | ||||
-rw-r--r-- | lisp/eshell/esh-ext.el | 4 | ||||
-rw-r--r-- | lisp/eshell/esh-io.el | 2 | ||||
-rw-r--r-- | lisp/eshell/esh-mode.el | 2 | ||||
-rw-r--r-- | lisp/eshell/esh-module.el | 2 | ||||
-rw-r--r-- | lisp/eshell/esh-opt.el | 2 | ||||
-rw-r--r-- | lisp/eshell/esh-proc.el | 4 | ||||
-rw-r--r-- | lisp/eshell/esh-test.el | 2 | ||||
-rw-r--r-- | lisp/eshell/esh-util.el | 2 | ||||
-rw-r--r-- | lisp/eshell/esh-var.el | 4 | ||||
-rw-r--r-- | lisp/eshell/eshell.el | 2 |
28 files changed, 31 insertions, 31 deletions
diff --git a/lisp/eshell/em-alias.el b/lisp/eshell/em-alias.el index 6b24c269b30..11f1bd4e9f3 100644 --- a/lisp/eshell/em-alias.el +++ b/lisp/eshell/em-alias.el @@ -1,7 +1,7 @@ ;;; em-alias.el --- creation and management of command aliases ;; 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> diff --git a/lisp/eshell/em-banner.el b/lisp/eshell/em-banner.el index 9087cae369c..8600bf4891e 100644 --- a/lisp/eshell/em-banner.el +++ b/lisp/eshell/em-banner.el @@ -1,7 +1,7 @@ ;;; em-banner.el --- sample module that displays a login banner ;; 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> diff --git a/lisp/eshell/em-basic.el b/lisp/eshell/em-basic.el index ce72f752d42..342521e1066 100644 --- a/lisp/eshell/em-basic.el +++ b/lisp/eshell/em-basic.el @@ -1,7 +1,7 @@ ;;; em-basic.el --- basic shell builtin commands ;; 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> diff --git a/lisp/eshell/em-cmpl.el b/lisp/eshell/em-cmpl.el index 554e010a1b3..0ecf7131311 100644 --- a/lisp/eshell/em-cmpl.el +++ b/lisp/eshell/em-cmpl.el @@ -1,7 +1,7 @@ ;;; em-cmpl.el --- completion using the TAB key ;; 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> diff --git a/lisp/eshell/em-dirs.el b/lisp/eshell/em-dirs.el index f4b2575def2..e6ef340cadf 100644 --- a/lisp/eshell/em-dirs.el +++ b/lisp/eshell/em-dirs.el @@ -1,7 +1,7 @@ ;;; em-dirs.el --- directory navigation commands ;; 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> diff --git a/lisp/eshell/em-glob.el b/lisp/eshell/em-glob.el index 6996bdbb7a0..3013a08575e 100644 --- a/lisp/eshell/em-glob.el +++ b/lisp/eshell/em-glob.el @@ -1,7 +1,7 @@ ;;; em-glob.el --- extended file name globbing ;; 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> diff --git a/lisp/eshell/em-hist.el b/lisp/eshell/em-hist.el index 82c9b0ccfc3..c687d35e7f4 100644 --- a/lisp/eshell/em-hist.el +++ b/lisp/eshell/em-hist.el @@ -1,7 +1,7 @@ ;;; em-hist.el --- history list management ;; 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> diff --git a/lisp/eshell/em-ls.el b/lisp/eshell/em-ls.el index 84af53efe58..7686576f741 100644 --- a/lisp/eshell/em-ls.el +++ b/lisp/eshell/em-ls.el @@ -1,7 +1,7 @@ ;;; em-ls.el --- implementation of ls in Lisp ;; 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> diff --git a/lisp/eshell/em-pred.el b/lisp/eshell/em-pred.el index 2b5cb1a0dc4..3b7e9fd6363 100644 --- a/lisp/eshell/em-pred.el +++ b/lisp/eshell/em-pred.el @@ -1,7 +1,7 @@ ;;; em-pred.el --- argument predicates and modifiers (ala zsh) ;; 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> diff --git a/lisp/eshell/em-prompt.el b/lisp/eshell/em-prompt.el index 29e1ace26b1..d7adaac9034 100644 --- 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> diff --git a/lisp/eshell/em-rebind.el b/lisp/eshell/em-rebind.el index 587ca0684be..8d32688928e 100644 --- a/lisp/eshell/em-rebind.el +++ b/lisp/eshell/em-rebind.el @@ -1,7 +1,7 @@ ;;; em-rebind.el --- rebind keys when point is at current input ;; 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> diff --git a/lisp/eshell/em-script.el b/lisp/eshell/em-script.el index 21a5d804073..a6fa3ee5805 100644 --- a/lisp/eshell/em-script.el +++ b/lisp/eshell/em-script.el @@ -1,7 +1,7 @@ ;;; em-script.el --- Eshell script files ;; 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> diff --git a/lisp/eshell/em-smart.el b/lisp/eshell/em-smart.el index afe3cf826b1..46a98b97daa 100644 --- a/lisp/eshell/em-smart.el +++ b/lisp/eshell/em-smart.el @@ -1,7 +1,7 @@ ;;; em-smart.el --- smart display of output ;; 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> diff --git a/lisp/eshell/em-term.el b/lisp/eshell/em-term.el index bd27d9f262e..97a5ac47412 100644 --- a/lisp/eshell/em-term.el +++ b/lisp/eshell/em-term.el @@ -1,7 +1,7 @@ ;;; em-term.el --- running visual commands ;; 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> diff --git a/lisp/eshell/em-unix.el b/lisp/eshell/em-unix.el index d4f62415084..7934398eb78 100644 --- a/lisp/eshell/em-unix.el +++ b/lisp/eshell/em-unix.el @@ -1,7 +1,7 @@ ;;; em-unix.el --- UNIX command aliases ;; 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> diff --git a/lisp/eshell/em-xtra.el b/lisp/eshell/em-xtra.el index 6f49bf4e0f6..e36d3b9aa55 100644 --- a/lisp/eshell/em-xtra.el +++ b/lisp/eshell/em-xtra.el @@ -1,7 +1,7 @@ ;;; em-xtra.el --- extra alias functions ;; 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> diff --git a/lisp/eshell/esh-arg.el b/lisp/eshell/esh-arg.el index e6d73acd434..0485c4f5b96 100644 --- a/lisp/eshell/esh-arg.el +++ b/lisp/eshell/esh-arg.el @@ -1,7 +1,7 @@ ;;; esh-arg.el --- argument processing ;; 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> diff --git a/lisp/eshell/esh-cmd.el b/lisp/eshell/esh-cmd.el index a12d8fb7f3b..53d142537b7 100644 --- a/lisp/eshell/esh-cmd.el +++ b/lisp/eshell/esh-cmd.el @@ -1,7 +1,7 @@ ;;; esh-cmd.el --- command invocation ;; 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> diff --git a/lisp/eshell/esh-ext.el b/lisp/eshell/esh-ext.el index 8a3f86a3997..239a265b52d 100644 --- a/lisp/eshell/esh-ext.el +++ b/lisp/eshell/esh-ext.el @@ -1,7 +1,7 @@ ;;; esh-ext.el --- commands external to Eshell -;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, -;; 2008, 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org> diff --git a/lisp/eshell/esh-io.el b/lisp/eshell/esh-io.el index 53b6fd2163e..f6d635b3b3a 100644 --- a/lisp/eshell/esh-io.el +++ b/lisp/eshell/esh-io.el @@ -1,7 +1,7 @@ ;;; esh-io.el --- I/O management ;; 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> diff --git a/lisp/eshell/esh-mode.el b/lisp/eshell/esh-mode.el index 4477f138478..d031b718255 100644 --- a/lisp/eshell/esh-mode.el +++ b/lisp/eshell/esh-mode.el @@ -1,7 +1,7 @@ ;;; esh-mode.el --- user interface ;; 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> diff --git a/lisp/eshell/esh-module.el b/lisp/eshell/esh-module.el index cf66f626485..d56e17211d9 100644 --- a/lisp/eshell/esh-module.el +++ b/lisp/eshell/esh-module.el @@ -1,7 +1,7 @@ ;;; esh-module.el --- Eshell modules ;; Copyright (C) 1999, 2000, 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> ;; Keywords: processes diff --git a/lisp/eshell/esh-opt.el b/lisp/eshell/esh-opt.el index 7662217237a..a56402ff2e5 100644 --- a/lisp/eshell/esh-opt.el +++ b/lisp/eshell/esh-opt.el @@ -1,7 +1,7 @@ ;;; esh-opt.el --- command options processing ;; 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> diff --git a/lisp/eshell/esh-proc.el b/lisp/eshell/esh-proc.el index ccc36ed9949..040cba66f3f 100644 --- a/lisp/eshell/esh-proc.el +++ b/lisp/eshell/esh-proc.el @@ -1,7 +1,7 @@ ;;; esh-proc.el --- process management -;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, -;; 2008, 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org> diff --git a/lisp/eshell/esh-test.el b/lisp/eshell/esh-test.el index 50d0a8e861c..1879bf96f41 100644 --- a/lisp/eshell/esh-test.el +++ b/lisp/eshell/esh-test.el @@ -1,7 +1,7 @@ ;;; esh-test.el --- Eshell test suite ;; 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> diff --git a/lisp/eshell/esh-util.el b/lisp/eshell/esh-util.el index 0a2ebba528f..5c630523172 100644 --- a/lisp/eshell/esh-util.el +++ b/lisp/eshell/esh-util.el @@ -1,7 +1,7 @@ ;;; esh-util.el --- general utilities ;; 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> diff --git a/lisp/eshell/esh-var.el b/lisp/eshell/esh-var.el index f76d1de3c8d..2d72183fdc6 100644 --- a/lisp/eshell/esh-var.el +++ b/lisp/eshell/esh-var.el @@ -1,7 +1,7 @@ ;;; esh-var.el --- handling of variables -;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, -;; 2008, 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org> diff --git a/lisp/eshell/eshell.el b/lisp/eshell/eshell.el index 3c534f049c5..9e0c5b7bdb7 100644 --- a/lisp/eshell/eshell.el +++ b/lisp/eshell/eshell.el @@ -1,7 +1,7 @@ ;;; eshell.el --- the Emacs command shell ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, -;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org> ;; Version: 2.4.2 |