From 581355cc06ed0800e3e675bfbb2aa00945462f42 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Thu, 29 Mar 2012 22:06:39 +0200 Subject: [PATCH] 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. --- nt/ChangeLog | 4 ++++ nt/config.nt | 3 +++ src/ChangeLog | 4 ++++ src/s/ms-w32.h | 3 +++ 4 files changed, 14 insertions(+) diff --git a/nt/ChangeLog b/nt/ChangeLog index 5c494578eeb..d0a85a4a319 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -1,3 +1,7 @@ +2012-03-29 Eli Zaretskii + + * config.nt: Discourage from defining HAVE_GETCWD. + 2012-03-25 Eli Zaretskii * makefile.w32-in (install-bin): Don't copy addpm.exe here. Use diff --git a/nt/config.nt b/nt/config.nt index 368dd33de29..d095655506e 100644 --- a/nt/config.nt +++ b/nt/config.nt @@ -235,6 +235,9 @@ along with GNU Emacs. If not, see . */ #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 1c740904eb3..e57b1af1b8b 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2012-03-29 Eli Zaretskii + + * s/ms-w32.h: Discourage from defining HAVE_GETCWD. + 2012-03-28 Stefan Monnier * 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 5eed3a177dc..e89ecb05931 100644 --- 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 -- 2.11.4.GIT