Merge from origin/emacs-25

bd58c13 Improve documentation of focus-related hooks
00a4720 Further improve doc string of 'disable-point-adjustment'
c582def Further adaptions in file-notify-tests.el for w32notify
a1585e1 Don't bug out on localised dates in gnus-icalendar

4 files changed, 87 insertions, 78 deletions

diff --git a/doc/lispref/commands.texi b/doc/lispref/commands.texi
index 3ea6ea045eb..2048e28d959 100644
--- a/doc/lispref/commands.texi
+++ b/doc/lispref/commands.texi
@@ -1664,7 +1664,8 @@ gets keyboard input.  This choice of window is called the @dfn{focus}.
 When the user does something to switch between Emacs frames, that
 generates a @dfn{focus event}.  The normal definition of a focus event,
 in the global keymap, is to select a new frame within Emacs, as the user
-would expect.  @xref{Input Focus}.
+would expect.  @xref{Input Focus}, which also describes hooks related
+to focus events.
 
 Focus events are represented in Lisp as lists that look like this:
 
diff --git a/lisp/gnus/gnus-icalendar.el b/lisp/gnus/gnus-icalendar.el
index 96697b22791..dea6523a541 100644
--- a/lisp/gnus/gnus-icalendar.el
+++ b/lisp/gnus/gnus-icalendar.el
@@ -412,10 +412,11 @@ Return nil for non-recurring EVENT."
          (end-date (format-time-string "%Y-%m-%d" end))
          (end-time (format-time-string "%H:%M" end))
          (end-at-midnight (string= end-time "00:00"))
-         (start-end-date-diff (/ (float-time (time-subtract
-                                        (date-to-time end-date)
-                                        (date-to-time start-date)))
-                                 86400))
+         (start-end-date-diff
+          (/ (float-time (time-subtract
+                          (org-time-string-to-time end-date)
+                          (org-time-string-to-time start-date)))
+             86400))
          (org-repeat (gnus-icalendar-event:org-repeat event))
          (repeat (if org-repeat (concat " " org-repeat) ""))
          (time-1-day '(0 86400)))
diff --git a/src/keyboard.c b/src/keyboard.c
index 4d107277634..6535e04d826 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -11624,8 +11624,8 @@ It's called with one argument, the help string to display.  */);
 
 After a command is executed, if point moved into a region that has
 special properties (e.g. composition, display), Emacs adjusts point to
-the boundary of the region.  But when a command binds this variable to
-non-nil, this point adjustment is suppressed.
+the boundary of the region.  But when a command leaves this variable at
+a non-nil value (e.g., with a setq), this point adjustment is suppressed.
 
 This variable is set to nil before reading a command, and is checked
 just after executing the command.  */);
@@ -11636,8 +11636,8 @@ just after executing the command.  */);
                doc: /* If non-nil, always suppress point adjustments.
 
 The default value is nil, in which case point adjustments are
-suppressed only after special commands that set
-`disable-point-adjustment' (which see) to non-nil.  */);
+suppressed only after special commands that leave
+`disable-point-adjustment' (which see) at a non-nil value.  */);
   Vglobal_disable_point_adjustment = Qnil;
 
   DEFVAR_LISP ("minibuffer-message-timeout", Vminibuffer_message_timeout,
diff --git a/test/lisp/filenotify-tests.el b/test/lisp/filenotify-tests.el
index a16de7fb058..9f0c0ed0dc1 100644
--- a/test/lisp/filenotify-tests.el
+++ b/test/lisp/filenotify-tests.el
@@ -64,7 +64,7 @@
 (defvar file-notify--test-event nil)
 (defvar file-notify--test-events nil)
 
-(defconst file-notify--test-read-event-timeout 0.02
+(defconst file-notify--test-read-event-timeout 0.01
   "Timeout for `read-event' calls.
 It is different for local and remote file notification libraries.")
 
@@ -72,7 +72,7 @@ It is different for local and remote file notification libraries.")
   "Timeout to wait for arriving events, in seconds."
   (cond
    ((file-remote-p temporary-file-directory) 6)
-   ((string-equal (file-notify--test-library) "w32notify") 10)
+   ((string-equal (file-notify--test-library) "w32notify") 4)
    ((eq system-type 'cygwin) 10)
    (t 3)))
 
@@ -417,8 +417,8 @@ longer than timeout seconds for the events to be delivered."
                   '(change) 'file-notify--test-event-handler)))
           (file-notify--test-with-events
               (cond
-               ;; w32notify does raise a `stopped' event when a
-               ;; watched directory is deleted.
+               ;; w32notify does not raise `deleted' and `stopped'
+               ;; events for the watched directory.
                ((string-equal (file-notify--test-library) "w32notify")
                 '(created changed deleted))
                ;; cygwin recognizes only `deleted' and `stopped' events.
@@ -449,9 +449,11 @@ longer than timeout seconds for the events to be delivered."
           (file-notify--test-with-events
               (cond
                ;; w32notify does not distinguish between `changed' and
-               ;; `attribute-changed'.
+               ;; `attribute-changed'.  It does not raise `deleted'
+               ;; and `stopped' events for the watched directory.
                ((string-equal (file-notify--test-library) "w32notify")
-                '(created changed created changed changed changed changed
+                '(created changed created changed
+                  changed changed changed
                   deleted deleted))
                ;; cygwin recognizes only `deleted' and `stopped' events.
                ((eq system-type 'cygwin)
@@ -488,8 +490,8 @@ longer than timeout seconds for the events to be delivered."
                   '(change) 'file-notify--test-event-handler)))
           (file-notify--test-with-events
               (cond
-               ;; w32notify does not distinguish between `changed' and
-               ;; `attribute-changed'.
+               ;; w32notify does not raise `deleted' and `stopped'
+               ;; events for the watched directory.
                ((string-equal (file-notify--test-library) "w32notify")
                 '(created changed renamed deleted))
                ;; cygwin recognizes only `deleted' and `stopped' events.
@@ -604,31 +606,29 @@ longer than timeout seconds for the events to be delivered."
             (should (string-match "another text" (buffer-string)))
 
             ;; Stop file notification.  Autorevert shall still work via polling.
-            ;; It doesn't work for w32notify.
-            (unless (string-equal (file-notify--test-library) "w32notify")
-              (file-notify-rm-watch auto-revert-notify-watch-descriptor)
+            (file-notify-rm-watch auto-revert-notify-watch-descriptor)
+            (file-notify--wait-for-events
+             timeout (null auto-revert-use-notify))
+            (should-not auto-revert-use-notify)
+            (should-not auto-revert-notify-watch-descriptor)
+
+            ;; Modify file.  We wait for two seconds, in order to
+            ;; have another timestamp.  One second seems to be too
+            ;; short.
+            (with-current-buffer (get-buffer-create "*Messages*")
+              (narrow-to-region (point-max) (point-max)))
+            (sleep-for 2)
+            (write-region
+             "foo bla" nil file-notify--test-tmpfile nil 'no-message)
+
+            ;; Check, that the buffer has been reverted.
+            (with-current-buffer (get-buffer-create "*Messages*")
               (file-notify--wait-for-events
-               timeout (null auto-revert-use-notify))
-              (should-not auto-revert-use-notify)
-              (should-not auto-revert-notify-watch-descriptor)
-
-              ;; Modify file.  We wait for two seconds, in order to
-              ;; have another timestamp.  One second seems to be too
-              ;; short.
-              (with-current-buffer (get-buffer-create "*Messages*")
-                (narrow-to-region (point-max) (point-max)))
-              (sleep-for 2)
-              (write-region
-               "foo bla" nil file-notify--test-tmpfile nil 'no-message)
-
-              ;; Check, that the buffer has been reverted.
-              (with-current-buffer (get-buffer-create "*Messages*")
-                (file-notify--wait-for-events
-                 timeout
-                 (string-match
-                  (format-message "Reverting buffer `%s'." (buffer-name buf))
-                  (buffer-string))))
-              (should (string-match "foo bla" (buffer-string))))))
+               timeout
+               (string-match
+                (format-message "Reverting buffer `%s'." (buffer-name buf))
+                (buffer-string))))
+            (should (string-match "foo bla" (buffer-string)))))
 
       ;; Cleanup.
       (with-current-buffer "*Messages*" (widen))
@@ -699,36 +699,37 @@ longer than timeout seconds for the events to be delivered."
     (file-notify--test-cleanup))
 
   (unwind-protect
-      ;; w32notify does not send a `stopped' event when deleting a
-      ;; directory.  The test does not work, therefore.
-      (unless (string-equal (file-notify--test-library) "w32notify")
-        (let ((temporary-file-directory
-               (make-temp-file "file-notify-test-parent" t)))
-          (should
-           (setq file-notify--test-tmpfile (file-notify--test-make-temp-name)
-                 file-notify--test-desc
-                 (file-notify-add-watch
-                  temporary-file-directory
-                  '(change) #'file-notify--test-event-handler)))
-          (file-notify--test-with-events
-              (cond
-               ;; cygwin recognizes only `deleted' and `stopped' events.
-               ((eq system-type 'cygwin)
-                '(deleted stopped))
-               ;; There are two `deleted' events, for the file and for
-               ;; the directory.  Except for kqueue.
-               ((string-equal (file-notify--test-library) "kqueue")
-                '(created changed deleted stopped))
-               (t '(created changed deleted deleted stopped)))
-            (should (file-notify-valid-p file-notify--test-desc))
-            (read-event nil nil file-notify--test-read-event-timeout)
-            (write-region
-             "any text" nil file-notify--test-tmpfile nil 'no-message)
-            (read-event nil nil file-notify--test-read-event-timeout)
-            (delete-directory temporary-file-directory t))
-          ;; After deleting the parent directory, the descriptor must
-          ;; not be valid anymore.
-          (should-not (file-notify-valid-p file-notify--test-desc))))
+      (let ((temporary-file-directory
+             (make-temp-file "file-notify-test-parent" t)))
+        (should
+         (setq file-notify--test-tmpfile (file-notify--test-make-temp-name)
+               file-notify--test-desc
+               (file-notify-add-watch
+                temporary-file-directory
+                '(change) #'file-notify--test-event-handler)))
+        (file-notify--test-with-events
+         (cond
+          ;; w32notify does not raise `deleted' and `stopped' events
+          ;; for the watched directory.
+          ((string-equal (file-notify--test-library) "w32notify")
+           '(created changed deleted))
+          ;; cygwin recognizes only `deleted' and `stopped' events.
+          ((eq system-type 'cygwin)
+           '(deleted stopped))
+          ;; There are two `deleted' events, for the file and for the
+          ;; directory.  Except for kqueue.
+          ((string-equal (file-notify--test-library) "kqueue")
+           '(created changed deleted stopped))
+          (t '(created changed deleted deleted stopped)))
+         (should (file-notify-valid-p file-notify--test-desc))
+         (read-event nil nil file-notify--test-read-event-timeout)
+         (write-region
+          "any text" nil file-notify--test-tmpfile nil 'no-message)
+         (read-event nil nil file-notify--test-read-event-timeout)
+         (delete-directory temporary-file-directory t))
+        ;; After deleting the parent directory, the descriptor must
+        ;; not be valid anymore.
+        (should-not (file-notify-valid-p file-notify--test-desc)))
 
     ;; Cleanup.
     (file-notify--test-cleanup)))
@@ -763,11 +764,8 @@ longer than timeout seconds for the events to be delivered."
     (file-notify--test-cleanup))
 
   (unwind-protect
-      ;; The batch-mode operation of w32notify is fragile (there's no
-      ;; input threads to send the message to).
-      (unless (and noninteractive
-                   (string-equal (file-notify--test-library) "w32notify"))
-        (setq file-notify--test-tmpfile
+      (progn
+        (setq file-notify--test-tmpfile
               (file-name-as-directory (file-notify--test-make-temp-name)))
         (make-directory file-notify--test-tmpfile)
         (should
@@ -1045,7 +1043,11 @@ the file watch."
                     directory-files-no-dot-files-regexp 'nosort))
                   'deleted)
                  ;; The events of the directory itself.
-                 '(deleted stopped))))
+                 (cond
+                  ;; w32notify does not raise `deleted' and `stopped'
+                  ;; events for the watched directory.
+                  ((string-equal (file-notify--test-library) "w32notify") '())
+                  (t '(deleted stopped))))))
           (delete-directory file-notify--test-tmpfile 'recursive))
         (should-not (file-notify-valid-p file-notify--test-desc1))
         (should-not (file-notify-valid-p file-notify--test-desc2)))
@@ -1065,7 +1067,12 @@ the file watch."
 
 ;; TODO:
 
-;; * For w32notify, no stopped events arrive when a directory is removed.
+;; * kqueue does not send all expected `deleted' events.  Maybe due to
+;;   the missing directory monitor.
+;; * For w32notify, no `deleted' and `stopped' events arrive when a
+;;   directory is removed.
+;; * For w32notify, no `attribute-changed' events arrive.  Its sends
+;;   `changed' events instead.
 ;; * Check, why cygwin recognizes only `deleted' and `stopped' events.
 
 (provide 'file-notify-tests)