Merge from trunk.

1 files changed, 22 insertions, 13 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 7362bf462a9..78fa3b501a3 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,25 @@
+2012-04-17  Paul Eggert  <eggert@cs.ucla.edu>
+
+        configure: new option --enable-gcc-warnings (Bug#11207)
+        * Makefile.in (C_WARNINGS_SWITCH): Remove.
+        (WARN_CFLAGS, WERROR_CFLAGS): New macros.
+        (ALL_CFLAGS): Use new macros rather than old.
+        * process.c: Ignore -Wstrict-overflow to work around GCC bug 52904.
+        * regex.c: Ignore -Wstrict-overflow.  If !emacs, also ignore
+        -Wunused-but-set-variable, -Wunused-function, -Wunused-macros,
+        -Wunused-result, -Wunused-variable.  This should go away once
+        the Emacs and Gnulib regex code is merged.
+        (xmalloc, xrealloc): Now static.
+
+2012-04-17  Glenn Morris  <rgm@gnu.org>
+
+        * dired.c (Fsystem_users): Doc fix.
+
+2012-04-17  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        * dired.c (Fsystem_users, Fsystem_groups): New functions.  (Bug#7900)
+        (syms_of_dired): Add them.
+
 2012-04-16  Paul Eggert  <eggert@cs.ucla.edu>
 
         Fix minor alloc.c problems found by static checking.
@@ -42,19 +64,6 @@
 
 2012-04-14  Paul Eggert  <eggert@cs.ucla.edu>
 
-        configure: new option --enable-gcc-warnings (Bug#11207)
-        * Makefile.in (C_WARNINGS_SWITCH): Remove.
-        (WARN_CFLAGS, WERROR_CFLAGS): New macros.
-        (ALL_CFLAGS): Use new macros rather than old.
-        * process.c: Ignore -Wstrict-overflow to work around GCC bug 52904.
-        * regex.c: Ignore -Wstrict-overflow.  If !emacs, also ignore
-        -Wunused-but-set-variable, -Wunused-function, -Wunused-macros,
-        -Wunused-result, -Wunused-variable.  This should go away once
-        the Emacs and Gnulib regex code is merged.
-        (xmalloc, xrealloc): Now static.
-
-2012-04-14  Paul Eggert  <eggert@cs.ucla.edu>
-
         Make GC_MAKE_GCPROS_NOOPS the default (Bug#9926).
         * lisp.h (GC_MARK_STACK): Default to GC_MAKE_GCPROS_NOOPS.
         * s/cygwin.h, s/darwin.h, s/freebsd.h, s/gnu.h, s/irix6-5.h, s/msdos.h: