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

1 files changed, 4 insertions, 4 deletions

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,