Merge from emacs-24; up to 2013-01-03T01:56:56Z!rgm@gnu.org

[bpt/emacs.git] / src / emacs.c

diff --git a/src/emacs.c b/src/emacs.c
index 3c80d3e..0538414 100644 (file)
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -696,7 +696,8 @@ main (int argc, char **argv)
 #endif
 
 #ifdef G_SLICE_ALWAYS_MALLOC
-  /* This is used by the Cygwin build.  */
+  /* This is used by the Cygwin build.  It's not needed starting with
+     cygwin-1.7.24, but it doesn't do any harm.  */
   xputenv ("G_SLICE=always-malloc");
 #endif