diff options
author | Glenn Morris <rgm@gnu.org> | 2021-02-19 08:36:55 -0800 |
---|---|---|
committer | Glenn Morris <rgm@gnu.org> | 2021-02-19 08:36:55 -0800 |
commit | 07b22b6b5d196b292f3cb03749b09092b2197cf9 (patch) | |
tree | 41580272d6339e71c3e06799a1659e250258a455 /doc | |
parent | 6830199984b9964286fda8e4c904ce84aa68e514 (diff) | |
parent | 4712c75ab853ee77587dbc1910cc7c0401e02aa0 (diff) | |
download | emacs-07b22b6b5d196b292f3cb03749b09092b2197cf9.tar.gz |
Merge from origin/emacs-27
4712c75ab8 Clarify when activate-mark-hook is run
abedf3a865 Fix language-environment and font selection on MS-Windows
8b8708eadd Fix example in Sequence Functions node in the manual
Diffstat (limited to 'doc')
-rw-r--r-- | doc/lispref/markers.texi | 4 | ||||
-rw-r--r-- | doc/lispref/sequences.texi | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/doc/lispref/markers.texi b/doc/lispref/markers.texi index b39373f0727..80f79b67e52 100644 --- a/doc/lispref/markers.texi +++ b/doc/lispref/markers.texi @@ -609,8 +609,8 @@ the function @code{use-region-p} for that (@pxref{The Region}). @defvarx deactivate-mark-hook These normal hooks are run, respectively, when the mark becomes active and when it becomes inactive. The hook @code{activate-mark-hook} is -also run at the end of the command loop if the mark is active and it -is possible that the region may have changed. +also run when the region is reactivated, for instance after using a +command that switches back to a buffer that has an active mark. @ignore This piece of command_loop_1, run unless deactivating the mark: if (current_buffer != prev_buffer || MODIFF != prev_modiff) diff --git a/doc/lispref/sequences.texi b/doc/lispref/sequences.texi index 0c74dbe2aa4..545fd408f88 100644 --- a/doc/lispref/sequences.texi +++ b/doc/lispref/sequences.texi @@ -609,7 +609,7 @@ returned value is a list. (seq-map-indexed (lambda (elt idx) (list idx elt)) '(a b c)) -@result{} ((0 a) (b 1) (c 2)) +@result{} ((0 a) (1 b) (2 c)) @end group @end example @end defun |