comparison 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
comparison
equal deleted inserted replaced
112227:07e52ed69b5d 112228:417b1e4d63cd
1 ;;; diff-mode.el --- a mode for viewing/editing context diffs 1 ;;; diff-mode.el --- a mode for viewing/editing context diffs
2 2
3 ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,2005, 2006, 3 ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,2005, 2006,
4 ;; 2007, 2008, 2009, 2010 Free Software Foundation, Inc. 4 ;; 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
5 5
6 ;; Author: Stefan Monnier <monnier@iro.umontreal.ca> 6 ;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
7 ;; Keywords: convenience patch diff vc 7 ;; Keywords: convenience patch diff vc
8 8
9 ;; This file is part of GNU Emacs. 9 ;; This file is part of GNU Emacs.