Move DIRECTORY_SEP from lisp.h to config.h

* configure.ac (DIRECTORY_SEP): Move here from src/lisp.h.

* src/lisp.h (DIRECTORY_SEP): Let configure set it.

* nt/config.nt (DIRECTORY_SEP): Move here from src/lisp.h.

* lib-src/movemail.c (DIRECTORY_SEP, IS_DIRECTORY_SEP):
* lib-src/make-docfile.c (DIRECTORY_SEP, IS_DIRECTORY_SEP):
* lib-src/emacsclient.c (DIRECTORY_SEP, IS_DIRECTORY_SEP, IS_DEVICE_SEP):
Remove (they are in config.h now).

4 files changed, 15 insertions, 35 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 33022de1a29..1262c917a4a 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,4 +1,9 @@
-2012-08-09  Glenn Morris  <rgm@gnu.org>
+2012-08-10  Glenn Morris  <rgm@gnu.org>
+
+        * movemail.c (DIRECTORY_SEP, IS_DIRECTORY_SEP):
+        * make-docfile.c (DIRECTORY_SEP, IS_DIRECTORY_SEP):
+        * emacsclient.c (DIRECTORY_SEP, IS_DIRECTORY_SEP, IS_DEVICE_SEP):
+        Remove (they are in config.h now).
 
         * ebrowse.c (PATH_LIST_SEPARATOR):
         Remove, and replace with SEPCHAR from config.h.
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index 0ba6535b79d..ef9bc9c6afd 100644
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -1,5 +1,6 @@
 /* Client process that communicates with GNU Emacs acting as server.
-   Copyright (C) 1986-1987, 1994, 1999-2012 Free Software Foundation, Inc.
+
+Copyright (C) 1986-1987, 1994, 1999-2012 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -213,21 +214,6 @@ xmalloc (size_t size)
 /* From sysdep.c */
 #if !defined (HAVE_GET_CURRENT_DIR_NAME) || defined (BROKEN_GET_CURRENT_DIR_NAME)
 
-/* From lisp.h */
-#ifndef DIRECTORY_SEP
-#define DIRECTORY_SEP '/'
-#endif
-#ifndef IS_DIRECTORY_SEP
-#define IS_DIRECTORY_SEP(_c_) ((_c_) == DIRECTORY_SEP)
-#endif
-#ifndef IS_DEVICE_SEP
-#ifndef DEVICE_SEP
-#define IS_DEVICE_SEP(_c_) 0
-#else
-#define IS_DEVICE_SEP(_c_) ((_c_) == DEVICE_SEP)
-#endif
-#endif
-
 char *get_current_dir_name (void);
 
 /* Return the current working directory.  Returns NULL on errors.
diff --git a/lib-src/make-docfile.c b/lib-src/make-docfile.c
index bd87b5b6524..c2ac8ed63f6 100644
--- a/lib-src/make-docfile.c
+++ b/lib-src/make-docfile.c
@@ -1,6 +1,7 @@
 /* Generate doc-string file for GNU Emacs from source files.
-   Copyright (C) 1985-1986, 1992-1994, 1997, 1999-2012
-                 Free Software Foundation, Inc.
+
+Copyright (C) 1985-1986, 1992-1994, 1997, 1999-2012
+  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -36,12 +37,13 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <config.h>
 
 /* Defined to be emacs_main, sys_fopen, etc. in config.h.  */
+/* FIXME Not for ages? */
 #undef main
 #undef fopen
 #undef chdir
 
 #include <stdio.h>
-#include <stdlib.h>
+#include <stdlib.h>       /* FIXME config.h unconditionally includes this */
 #ifdef MSDOS
 #include <fcntl.h>
 #endif /* MSDOS */
@@ -58,14 +60,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define READ_BINARY "r"
 #endif /* not DOS_NT */
 
-#ifndef DIRECTORY_SEP
-#define DIRECTORY_SEP '/'
-#endif
-
-#ifndef IS_DIRECTORY_SEP
-#define IS_DIRECTORY_SEP(_c_) ((_c_) == DIRECTORY_SEP)
-#endif
-
 /* Use this to suppress gcc's `...may be used before initialized' warnings.  */
 #ifdef lint
 # define IF_LINT(Code) Code
@@ -79,6 +73,8 @@ static int scan_c_file (char *filename, const char *mode);
 static void start_globals (void);
 static void write_globals (void);
 
+/* FIXME msdos does not define this any more, and in any case we
+   undefined it for everyone just above.  */
 #ifdef MSDOS
 /* s/msdos.h defines this as sys_chdir, but we're not linking with the
    file where that function is defined.  */
diff --git a/lib-src/movemail.c b/lib-src/movemail.c
index df1c1137df5..3ea4f4521c1 100644
--- a/lib-src/movemail.c
+++ b/lib-src/movemail.c
@@ -275,13 +275,6 @@ main (int argc, char **argv)
   else
 #endif
     {
-      #ifndef DIRECTORY_SEP
-       #define DIRECTORY_SEP '/'
-      #endif
-      #ifndef IS_DIRECTORY_SEP
-       #define IS_DIRECTORY_SEP(_c_) ((_c_) == DIRECTORY_SEP)
-      #endif
-
       /* Use a lock file named after our first argument with .lock appended:
          If it exists, the mail file is locked.  */
       /* Note: this locking mechanism is *required* by the mailer