aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/lispref/ChangeLog5
-rw-r--r--doc/lispref/markers.texi12
2 files changed, 13 insertions, 4 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index d2bda41eb03..42ec24fac5f 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,8 +1,9 @@
12012-03-07 Glenn Morris <rgm@gnu.org> 12012-03-07 Glenn Morris <rgm@gnu.org>
2 2
3 * markers.texi (The Region): 3 * markers.texi (The Region): Briefly mention use-empty-active-region
4 Briefly mention use-empty-active-region and region-active-p. 4 and region-active-p.
5 (Overview of Markers): Reword garbage collection, add cross-ref. 5 (Overview of Markers): Reword garbage collection, add cross-ref.
6 (The Mark): Tiny clarification re command loop and activate-mark-hook.
6 7
72012-03-07 Chong Yidong <cyd@gnu.org> 82012-03-07 Chong Yidong <cyd@gnu.org>
8 9
diff --git a/doc/lispref/markers.texi b/doc/lispref/markers.texi
index b199dba979a..25a9fc88fc5 100644
--- a/doc/lispref/markers.texi
+++ b/doc/lispref/markers.texi
@@ -595,8 +595,16 @@ the function @code{use-region-p} for that (@pxref{The Region}).
595@defvarx deactivate-mark-hook 595@defvarx deactivate-mark-hook
596These normal hooks are run, respectively, when the mark becomes active 596These normal hooks are run, respectively, when the mark becomes active
597and when it becomes inactive. The hook @code{activate-mark-hook} is 597and when it becomes inactive. The hook @code{activate-mark-hook} is
598also run at the end of a command if the mark is active and it is 598also run at the end of the command loop if the mark is active and it
599possible that the region may have changed. 599is possible that the region may have changed.
600@ignore
601This piece of command_loop_1, run unless deactivating the mark:
602 if (current_buffer != prev_buffer || MODIFF != prev_modiff)
603 {
604 Lisp_Object hook = intern ("activate-mark-hook");
605 Frun_hooks (1, &hook);
606 }
607@end ignore
600@end defvar 608@end defvar
601 609
602@defun handle-shift-selection 610@defun handle-shift-selection