Merge from emacs-24; up to 2012-12-22T02:59:08Z!cyd@gnu.org

[bpt/emacs.git] / src / scroll.c

diff --git a/src/scroll.c b/src/scroll.c
index 79dd464..9e11feb 100644 (file)
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -1,7 +1,7 @@
 /* Calculate what line insertion or deletion to do, and do it
 
-Copyright (C) 1985-1986, 1990, 1993-1994, 2001-2012
-  Free Software Foundation, Inc.
+Copyright (C) 1985-1986, 1990, 1993-1994, 2001-2013 Free Software
+Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -21,7 +21,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 #include <stdio.h>
-#include <setjmp.h>
+
 #include "lisp.h"
 #include "termchar.h"
 #include "dispextern.h"