diff lisp/vc/diff-mode.el @ 112228:417b1e4d63cd

Merge from emacs-23
author Stefan Monnier <monnier@iro.umontreal.ca>
date Fri, 14 Jan 2011 12:18:41 -0500
parents c00190a8c8ef
children ef719132ddfa
line wrap: on
line diff
--- a/lisp/vc/diff-mode.el	Fri Jan 14 16:06:17 2011 +0100
+++ b/lisp/vc/diff-mode.el	Fri Jan 14 12:18:41 2011 -0500
@@ -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