--- a/lisp/ChangeLog	Fri Sep 19 00:35:28 2003 +0000
+++ b/lisp/ChangeLog	Fri Sep 19 09:50:09 2003 +0000
@@ -1,3 +1,10 @@
+2003-09-19  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* win32-native.el (grep-null-device): Defined in
+	xemacs-base/compile.el.
+
+	* files.el (null-device): Defined in C, remove defvar.
+
 2003-09-06  Mike Sperber  <mike@xemacs.org>
 
 	* bytecomp.el (byte-compile-defvar-or-defconst): Actually

--- a/lisp/files.el	Fri Sep 19 00:35:28 2003 +0000
+++ b/lisp/files.el	Fri Sep 19 09:50:09 2003 +0000
@@ -233,9 +233,6 @@
 by programs that create small temporary files.  This is for systems that
 have fast storage with limited space, such as a RAM disk.")
 
-;; The system null device. (Should reference NULL_DEVICE from C.)
-(defvar null-device "/dev/null" "The system null device.")
-
 ; (defvar file-name-invalid-regexp
 ;   (cond ((and (eq system-type 'ms-dos) (not (msdos-long-file-names)))
 ; 	 (concat "^\\([^A-Z[-`a-z]\\|..+\\)?:\\|" ; colon except after drive

--- a/lisp/win32-native.el	Fri Sep 19 00:35:28 2003 +0000
+++ b/lisp/win32-native.el	Fri Sep 19 09:50:09 2003 +0000
@@ -55,11 +55,6 @@
 ;; Use ";" instead of ":" as a path separator (from files.el).
 (setq path-separator ";")
 
-;; Set the null device (for compile.el).
-;; #### There should be such a global thingy as null-device - kkm
-(defvar grep-null-device)
-(setq grep-null-device "NUL")
-
 ;; Set the grep regexp to match entries with drive letters.
 (defvar grep-regexp-alist)
 (setq grep-regexp-alist