Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs

3 files changed, 39 insertions, 19 deletions

diff --git a/src/fileio.c b/src/fileio.c
index 9955f83e625..7afe3e75737 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -6531,7 +6531,18 @@ If the underlying system call fails, value is nil.  */)
   || defined STAT_STATFS4 || defined STAT_STATVFS               \
   || defined STAT_STATVFS64
   struct fs_usage u;
-  if (get_fs_usage (SSDATA (ENCODE_FILE (filename)), NULL, &u) != 0)
+  const char *name;
+
+  name = SSDATA (ENCODE_FILE (filename));
+
+#if defined HAVE_ANDROID && !defined ANDROID_STUBIFY
+  /* With special directories, this information is unavailable.  */
+  if (android_is_special_directory (name, "/assets")
+      || android_is_special_directory (name, "/content"))
+    return Qnil;
+#endif /* defined HAVE_ANDROID && !defined ANDROID_STUBIFY */
+
+  if (get_fs_usage (name, NULL, &u) != 0)
     return errno == ENOSYS ? Qnil : file_attribute_errno (filename, errno);
   return list3 (blocks_to_bytes (u.fsu_blocksize, u.fsu_blocks, false),
                 blocks_to_bytes (u.fsu_blocksize, u.fsu_bfree, false),
diff --git a/src/kqueue.c b/src/kqueue.c
index 4693e130208..aabaab6c8c3 100644
--- a/src/kqueue.c
+++ b/src/kqueue.c
@@ -444,23 +444,29 @@ only when the upper directory of the renamed file is watched.  */)
   if (! NILP (Fmember (Qrevoke, flags))) fflags |= NOTE_REVOKE;
 
   /* Register event.  */
-  EV_SET (&kev, fd, EVFILT_VNODE, EV_ADD | EV_ENABLE | EV_CLEAR,
+  EV_SET (&kev, fd, EVFILT_VNODE, (EV_ADD
+#ifdef EV_ENABLE
+                                   | EV_ENABLE
+#endif /* EV_ENABLE */
+                                   | EV_CLEAR),
           fflags, 0, NULL);
 
-  if (kevent (kqueuefd, &kev, 1, NULL, 0, NULL) < 0) {
-    emacs_close (fd);
-    report_file_error ("Cannot watch file", file);
-  }
+  if (kevent (kqueuefd, &kev, 1, NULL, 0, NULL) < 0)
+    {
+      emacs_close (fd);
+      report_file_error ("Cannot watch file", file);
+    }
 
   /* Store watch object in watch list.  */
   Lisp_Object watch_descriptor = make_fixnum (fd);
   if (NILP (Ffile_directory_p (file)))
     watch_object = list4 (watch_descriptor, file, flags, callback);
-  else {
-    dir_list = directory_files_internal (file, Qnil, Qnil, Qnil, true, Qnil,
-                                         Qnil);
-    watch_object = list5 (watch_descriptor, file, flags, callback, dir_list);
-  }
+  else
+    {
+      dir_list = directory_files_internal (file, Qnil, Qnil, Qnil, true, Qnil,
+                                           Qnil);
+      watch_object = list5 (watch_descriptor, file, flags, callback, dir_list);
+    }
   watch_list = Fcons (watch_object, watch_list);
 
   return watch_descriptor;
@@ -486,11 +492,12 @@ WATCH-DESCRIPTOR should be an object returned by `kqueue-add-watch'.  */)
   /* Remove watch descriptor from watch list.  */
   watch_list = Fdelq (watch_object, watch_list);
 
-  if (NILP (watch_list) && (kqueuefd >= 0)) {
-    delete_read_fd (kqueuefd);
-    emacs_close (kqueuefd);
-    kqueuefd = -1;
-  }
+  if (NILP (watch_list) && (kqueuefd >= 0))
+    {
+      delete_read_fd (kqueuefd);
+      emacs_close (kqueuefd);
+      kqueuefd = -1;
+    }
 
   return Qt;
 }
diff --git a/src/timefns.c b/src/timefns.c
index 0ecbb6e6793..746e422ffb6 100644
--- a/src/timefns.c
+++ b/src/timefns.c
@@ -414,9 +414,11 @@ decode_float_time (double t, struct lisp_time *result)
   else
     {
       int scale = double_integer_scale (t);
-      /* FIXME: `double_integer_scale` often returns values that are
-         "pessimistic" (i.e. larger than necessary), so 3.5 gets converted
-         to (7881299347898368 . 2251799813685248) rather than (7 . 2).
+      /* Because SCALE treats trailing zeros in T as significant,
+         on typical platforms with IEEE floating point
+         (time-convert 3.5 t) yields (7881299347898368 . 2251799813685248),
+         a precision of 2**-51 s, not (7 . 2), a precision of 0.5 s.
+         Although numerically correct, this generates largish integers.
          On 64bit systems, this should not matter very much, tho.  */
       eassume (scale < flt_radix_power_size);