From: Tom Tromey <tromey@redhat.com>
Date: Wed, 19 Jan 2011 15:06:24 +0000 (-0700)
Subject: * window.c: Fix error introduced by previous patch.
X-Git-Tag: emacs-pretest-24.0.90~104^2~618^2~1322^2~203
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ef79d2fac2a4d8e71538b4dc67e771f2c0a178a0;p=emacs.git

* window.c: Fix error introduced by previous patch.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 02887713397..221ad694219 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2011-01-19  Tom Tromey  <tromey@redhat.com>
+
+	* window.c: Fix error introduced by previous patch.
+
 2011-01-18  Tom Tromey  <tromey@parfait>
 
 	* globals.h: New file.
diff --git a/src/window.c b/src/window.c
index 1dd824eeb6f..22e3f3d8818 100644
--- a/src/window.c
+++ b/src/window.c
@@ -151,7 +151,7 @@ static int window_scroll_preserve_vpos;
 #if 0 /* This isn't used anywhere.  */
 /* Nonzero means we can split a frame even if it is "unsplittable".  */
 static int inhibit_frame_unsplittable;
-#endif extern Lisp_Object Qwindow_scroll_functions, Vwindow_scroll_functions;
+#endif
 
 
 DEFUN ("windowp", Fwindowp, Swindowp, 1, 1, 0,