Merge from trunk.

2 files changed, 6 insertions, 3 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 78fa3b501a3..ae245a254a0 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -11,6 +11,10 @@
         the Emacs and Gnulib regex code is merged.
         (xmalloc, xrealloc): Now static.
 
+2012-04-17  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * dired.c (Fsystem_groups): Remove unused local.
+
 2012-04-17  Glenn Morris  <rgm@gnu.org>
 
         * dired.c (Fsystem_users): Doc fix.
diff --git a/src/dired.c b/src/dired.c
index eeae59d2801..367bcb4031d 100644
--- a/src/dired.c
+++ b/src/dired.c
@@ -1023,7 +1023,7 @@ return a list with one element, taken from `user-real-login-name'.  */)
      (void)
 {
   Lisp_Object users = Qnil;
-#if defined(HAVE_GETPWENT) && defined(HAVE_ENDPWENT)
+#if defined HAVE_GETPWENT && defined HAVE_ENDPWENT
   struct passwd *pw;
 
   while ((pw = getpwent ()))
@@ -1043,9 +1043,8 @@ The value may be nil if not supported on this platform.  */)
      (void)
 {
   Lisp_Object groups = Qnil;
-#if defined(HAVE_GETGRENT) && defined(HAVE_ENDGRENT)
+#if defined HAVE_GETGRENT && defined HAVE_ENDGRENT
   struct group *gr;
-  int length;
 
   while ((gr = getgrent ()))
     groups = Fcons (DECODE_SYSTEM (build_string (gr->gr_name)), groups);