# HG changeset patch
# User Eli Zaretskii <eliz@gnu.org>
# Date 1263643163 18000
# Node ID d615810795cd35066a847d63ec63cc282cb33df4
# Parent  c5f9e461339404e622974233fa3f85b8c1c9a057# Parent  d6fc227388551ccf6b15cccd02fc1cf5ff5932c1
Merge from mainline.

diff -r c5f9e4613394 -r d615810795cd src/xdisp.c
--- 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.