Merged in changes from CVS trunk. Plus added lisp/term tweaks.

[gnu-emacs] / src / scroll.c

diff --git a/src/scroll.c b/src/scroll.c
index f73f6f4fa80530692275cd9aa0d49236c9a5ed04..04db528cc641b9eaf14dd77b8fb7e1caf53e8789 100644 (file)
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -1,5 +1,6 @@
 /* Calculate what line insertion or deletion to do, and do it,
-   Copyright (C) 1985, 1986, 1990, 1993, 1994 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1990, 1993, 1994, 2002, 2003, 2004,
+                 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.