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

diff --cc doc/lispref/commands.texi
Simple merge

diff --cc lisp/gnus/gnus-icalendar.el
index 96697b22791e26bd6504a548734a9ea7e45302d8,d7a431ae8c6d16948daafd69e5a444a960c60325..dea6523a541f53711bad4c4fd8e66063f53711ef
--- 1/lisp/gnus/gnus-icalendar.el
--- 2/lisp/gnus/gnus-icalendar.el
+++ b/lisp/gnus/gnus-icalendar.el
@@@ -406,16 -394,17 +406,17 @@@ Return nil for non-recurring EVENT.
    "Build `org-mode' timestamp from EVENT start/end dates and recurrence info."
    (let* ((start (gnus-icalendar-event:start-time event))
           (end (gnus-icalendar-event:end-time event))
 -         (start-date (format-time-string "%Y-%m-%d %a" start))
 +         (start-date (format-time-string "%Y-%m-%d" start))
           (start-time (format-time-string "%H:%M" start))
           (start-at-midnight (string= start-time "00:00"))
 -         (end-date (format-time-string "%Y-%m-%d %a" end))
 +         (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 --cc src/keyboard.c
Simple merge

diff --cc test/lisp/filenotify-tests.el
Simple merge