2 files changed, 14 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index d1528cbfe4e..e41f04ef6ff 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2008-04-05  Eli Zaretskii  <eliz@gnu.org>
+
+        * dired.c (Ffile_attributes) [WINDOWSNT]: Force inode be positive.
+
 2008-03-31  Chong Yidong  <cyd@stupidchicken.com>
 
         * xdisp.c (next_overlay_string): Don't set
diff --git a/src/dired.c b/src/dired.c
index 1a80a41633d..31b7e19ddae 100644
--- a/src/dired.c
+++ b/src/dired.c
@@ -1028,7 +1028,17 @@ Elements of the attribute list are:
   values[9] = (gid != getegid ()) ? Qt : Qnil;
 #endif  /* BSD4_2 (or BSD4_3) */
   /* Shut up GCC warnings in FIXNUM_OVERFLOW_P below.  */
+#ifdef WINDOWSNT
+  {
+    /* The bit-shuffling we do in w32.c:stat can turn on the MSB, which
+       will produce negative inode numbers.  People don't like that, so
+       force a positive inode instead.  */
+    unsigned short tem = s.st_ino;
+    ino = tem;
+  }
+#else
   ino = s.st_ino;
+#endif
   if (FIXNUM_OVERFLOW_P (ino))
     /* To allow inode numbers larger than VALBITS, separate the bottom
        16 bits.  */