Merge from emacs-23

[gnu-emacs] / lisp / vc / diff-mode.el

diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el
index c16c2460e75ef65fec3d5ad17efa975aabf2435a..e8c79aead647c4e0bf2b3f8fb1f8b7626b8eafcc 100644 (file)
--- a/lisp/vc/diff-mode.el
+++ b/lisp/vc/diff-mode.el
@@ -1,7 +1,7 @@
 ;;; diff-mode.el --- a mode for viewing/editing context diffs
 
 ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,2005, 2006,
-;;   2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+;;   2007, 2008, 2009, 2010, 2011  Free Software Foundation, Inc.
 
 ;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
 ;; Keywords: convenience patch diff vc