Mercurial > emacs
comparison lisp/diff-mode.el @ 107617:c5f9e4613394
Merge from mainline.
author | Eli Zaretskii <eliz@gnu.org> |
---|---|
date | Sat, 16 Jan 2010 06:57:09 -0500 |
parents | 1d1d5d9bd884 |
children | dc9565b08f10 8027e412df98 |
comparison
equal
deleted
inserted
replaced
107616:fa5ad3eee9f5 | 107617:c5f9e4613394 |
---|---|
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 Free Software Foundation, Inc. | 4 ;; 2007, 2008, 2009, 2010 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 | 7 ;; Keywords: convenience patch diff |
8 | 8 |
9 ;; This file is part of GNU Emacs. | 9 ;; This file is part of GNU Emacs. |