Discourage in comments from defining HAVE_GETCWD on MS-Windows.

 src/s/ms-w32.h: Discourage from defining HAVE_GETCWD.
 nt/config.nt: Discourage from defining HAVE_GETCWD.

diff --git a/nt/ChangeLog b/nt/ChangeLog
index 5c494578eeb5e76d274d02f8aa30f850c590168d..d0a85a4a319fc4a775557c61008dc605c509313b 100644 (file)
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,7 @@
+2012-03-29  Eli Zaretskii  <eliz@gnu.org>
+
+       * config.nt: Discourage from defining HAVE_GETCWD.
+
 2012-03-25  Eli Zaretskii  <eliz@gnu.org>
 
        * makefile.w32-in (install-bin): Don't copy addpm.exe here.  Use

diff --git a/nt/config.nt b/nt/config.nt
index 368dd33de293f584d60dc2be9c01897ee1beb0bd..d095655506e9bf200e92cdeacec94de4e01813fe 100644 (file)
--- a/nt/config.nt
+++ b/nt/config.nt
@@ -235,6 +235,9 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #undef HAVE_UTIMES
 #undef HAVE_SETRLIMIT
 #undef HAVE_SETPGID
+/* If you think about defining HAVE_GETCWD, don't: the alternative
+   getwd is redefined on w32.c, and does not really return the current
+   directory, to get the desired results elsewhere in Emacs */
 #undef HAVE_GETCWD
 #undef HAVE_SHUTDOWN
 #undef HAVE_STRFTIME

diff --git a/src/ChangeLog b/src/ChangeLog
index 1c740904eb351696d76806ef74d5d87879f2f05a..e57b1af1b8b99f5f8600e8cd4f3df7967172fceb 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2012-03-29  Eli Zaretskii  <eliz@gnu.org>
+
+       * s/ms-w32.h: Discourage from defining HAVE_GETCWD.
+
 2012-03-28  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * keyboard.c (safe_run_hooks_error): Don't unquote strings.

diff --git a/src/s/ms-w32.h b/src/s/ms-w32.h
index 5eed3a177dcfe57028c28e4e42ddfe5d9e34d42a..e89ecb0593189857d367b4659ed6c911026e057a 100644 (file)
--- a/src/s/ms-w32.h
+++ b/src/s/ms-w32.h
@@ -159,6 +159,9 @@ struct sigaction {
 #undef  HAVE_UTIMES
 #undef  HAVE_SETRLIMIT
 #undef  HAVE_SETPGID
+/* If you think about defining HAVE_GETCWD, don't: the alternative
+   getwd is redefined on w32.c, and does not really return the current
+   directory, to get the desired results elsewhere in Emacs */
 #undef  HAVE_GETCWD
 #define HAVE_SHUTDOWN 1