aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSam Steingold2011-01-19 10:24:40 -0500
committerSam Steingold2011-01-19 10:24:40 -0500
commit4e55715e8a0dbad05de61d3e8568b58b08b06d05 (patch)
treee50253b03271a223008a13394ebf9b0887db2d3f
parentef79d2fac2a4d8e71538b4dc67e771f2c0a178a0 (diff)
downloademacs-4e55715e8a0dbad05de61d3e8568b58b08b06d05.tar.gz
emacs-4e55715e8a0dbad05de61d3e8568b58b08b06d05.zip
* src/w32.c (check_windows_init_file): Remove declarations of
Vwindow_system, Vload_path, Qfile_exists_p to fix compilation.
-rw-r--r--src/ChangeLog5
-rw-r--r--src/w32.c1
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 221ad694219..99ab13d2995 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12011-01-19 Sam Steingold <sds@gnu.org>
2
3 * w32.c (check_windows_init_file): Remove declarations of
4 Vwindow_system, Vload_path, Qfile_exists_p to fix compilation.
5
12011-01-19 Tom Tromey <tromey@redhat.com> 62011-01-19 Tom Tromey <tromey@redhat.com>
2 7
3 * window.c: Fix error introduced by previous patch. 8 * window.c: Fix error introduced by previous patch.
diff --git a/src/w32.c b/src/w32.c
index b10f9ec9db4..e508e4e3fa5 100644
--- a/src/w32.c
+++ b/src/w32.c
@@ -5656,7 +5656,6 @@ check_windows_init_file (void)
5656 5656
5657 if (!noninteractive && !inhibit_window_system) 5657 if (!noninteractive && !inhibit_window_system)
5658 { 5658 {
5659 extern Lisp_Object Vwindow_system, Vload_path, Qfile_exists_p;
5660 Lisp_Object objs[2]; 5659 Lisp_Object objs[2];
5661 Lisp_Object full_load_path; 5660 Lisp_Object full_load_path;
5662 Lisp_Object init_file; 5661 Lisp_Object init_file;