[Emacs-diffs] /srv/bzr/emacs/trunk r109539: Move DIRECTORY_SEP from lisp.h to config.h

[Glenn Morris]

------------------------------------------------------------
revno: 109539
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Thu 2012-08-09 20:02:10 -0400
message:
  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).
modified:
  ChangeLog
  configure.ac
  lib-src/ChangeLog
  lib-src/emacsclient.c
  lib-src/make-docfile.c
  lib-src/movemail.c
  nt/ChangeLog
  nt/config.nt
  src/ChangeLog
  src/lisp.h

=== modified file 'ChangeLog'
--- a/ChangeLog 2012-08-08 16:17:15 +0000
+++ b/ChangeLog 2012-08-10 00:02:10 +0000
@@ -1,3 +1,7 @@
+2012-08-10  Glenn Morris  <address@hidden>
+
+       * configure.ac (DIRECTORY_SEP): Move here from src/lisp.h.
+
 2012-08-08  Dmitry Antipov  <address@hidden>
 
        * configure.ac (--disable-features): Rename to --without-all.

=== modified file 'configure.ac'
--- a/configure.ac      2012-08-08 16:17:15 +0000
+++ b/configure.ac      2012-08-10 00:02:10 +0000
@@ -3185,6 +3185,9 @@
 AC_DEFINE(USER_FULL_NAME, [pw->pw_gecos], [How to get a user's full name.])
 
 
+AC_DEFINE(DIRECTORY_SEP, ['/'],
+  [Character that separates directories in a file name.])
+
 dnl Only used on MS platforms.
 AH_TEMPLATE(DEVICE_SEP, [Character that separates a device in a file name.])
 

=== modified file 'lib-src/ChangeLog'
--- a/lib-src/ChangeLog 2012-08-09 23:53:07 +0000
+++ b/lib-src/ChangeLog 2012-08-10 00:02:10 +0000
@@ -1,4 +1,9 @@
-2012-08-09  Glenn Morris  <address@hidden>
+2012-08-10  Glenn Morris  <address@hidden>
+
+       * 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.

=== modified file 'lib-src/emacsclient.c'
--- a/lib-src/emacsclient.c     2012-07-11 05:44:06 +0000
+++ b/lib-src/emacsclient.c     2012-08-10 00:02:10 +0000
@@ -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 @@
 /* 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.

=== modified file 'lib-src/make-docfile.c'
--- a/lib-src/make-docfile.c    2012-07-10 21:48:34 +0000
+++ b/lib-src/make-docfile.c    2012-08-10 00:02:10 +0000
@@ -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 @@
 #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 @@
 #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 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.  */

=== modified file 'lib-src/movemail.c'
--- a/lib-src/movemail.c        2012-08-08 16:03:04 +0000
+++ b/lib-src/movemail.c        2012-08-10 00:02:10 +0000
@@ -275,13 +275,6 @@
   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

=== modified file 'nt/ChangeLog'
--- a/nt/ChangeLog      2012-08-07 11:03:48 +0000
+++ b/nt/ChangeLog      2012-08-10 00:02:10 +0000
@@ -1,3 +1,7 @@
+2012-08-10  Glenn Morris  <address@hidden>
+
+       * config.nt (DIRECTORY_SEP): Move here from src/lisp.h.
+
 2012-08-07  Juanma Barranquero  <address@hidden>
 
        * config.nt: Sync with autogen/config.nt.

=== modified file 'nt/config.nt'
--- a/nt/config.nt      2012-08-07 11:03:48 +0000
+++ b/nt/config.nt      2012-08-10 00:02:10 +0000
@@ -1,7 +1,6 @@
 /* GNU Emacs site configuration template file.
 
-Copyright (C) 1988, 1993-1994, 2001-2012
-  Free Software Foundation, Inc.
+Copyright (C) 1988, 1993-1994, 2001-2012 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -131,6 +130,9 @@
 /* Define to 1 for DGUX with <sys/dg_sys_info.h>. */
 #undef DGUX
 
+/* Character that separates directories in a file name. */
+#define DIRECTORY_SEP '/'
+
 /* Define if dispnew.c should include stdio_ext.h. */
 #undef DISPNEW_NEEDS_STDIO_EXT
 

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-08-09 05:14:23 +0000
+++ b/src/ChangeLog     2012-08-10 00:02:10 +0000
@@ -1,3 +1,7 @@
+2012-08-10  Glenn Morris  <address@hidden>
+
+       * lisp.h (DIRECTORY_SEP): Let configure set it.
+
 2012-08-09  Dmitry Antipov  <address@hidden>
 
        Use TSET for write access to Lisp_Object slots of struct terminal.

=== modified file 'src/lisp.h'
--- a/src/lisp.h        2012-08-08 19:53:44 +0000
+++ b/src/lisp.h        2012-08-10 00:02:10 +0000
@@ -3418,8 +3418,6 @@
 /* Set up the name of the machine we're running on.  */
 extern void init_system_name (void);
 
-static char const DIRECTORY_SEP = '/';
-
 /* Use this to suppress gcc's warnings.  */
 #ifdef lint