aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/w32xfns.c1
2 files changed, 5 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index fc61fbb1330..375c6905f73 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12013-12-04 Eli Zaretskii <eliz@gnu.org>
2
3 * w32xfns.c: Include window.h, to avoid a compiler warning.
4
12013-12-04 Stefan Monnier <monnier@iro.umontreal.ca> 52013-12-04 Stefan Monnier <monnier@iro.umontreal.ca>
2 6
3 * window.c (window_scroll): Mark window for redisplay (bug#16034). 7 * window.c (window_scroll): Mark window for redisplay (bug#16034).
diff --git a/src/w32xfns.c b/src/w32xfns.c
index 07f75477863..b49abffa130 100644
--- a/src/w32xfns.c
+++ b/src/w32xfns.c
@@ -24,6 +24,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
24#include "lisp.h" 24#include "lisp.h"
25#include "keyboard.h" 25#include "keyboard.h"
26#include "frame.h" 26#include "frame.h"
27#include "window.h"
27#include "charset.h" 28#include "charset.h"
28#include "fontset.h" 29#include "fontset.h"
29#include "blockinput.h" 30#include "blockinput.h"