Mercurial > emacs
changeset 107618:d615810795cd
Merge from mainline.
author | Eli Zaretskii <eliz@gnu.org> |
---|---|
date | Sat, 16 Jan 2010 06:59:23 -0500 |
parents | c5f9e4613394 (current diff) d6fc22738855 (diff) |
children | 41011b06e0aa |
files | src/xdisp.c |
diffstat | 1 files changed, 2 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/xdisp.c Sat Jan 16 06:57:09 2010 -0500 +++ b/src/xdisp.c Sat Jan 16 06:59:23 2010 -0500 @@ -1,7 +1,8 @@ /* Display generation from window structure and buffer text. Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995, 1997, 1998, 1999, 2000, 2001, 2002, 2003, - 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. + 2004, 2005, 2006, 2007, 2008, 2009, 2010 + Free Software Foundation, Inc. This file is part of GNU Emacs.