aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/simple.el6
2 files changed, 7 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index eb8f0785b26..9a04d8bbc76 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12010-07-10 Chong Yidong <cyd@stupidchicken.com>
2
3 * simple.el (use-region-p): Doc fix (Bug#6607).
4
12010-07-07 Christoph Scholtes <cschol2112@gmail.com> 52010-07-07 Christoph Scholtes <cschol2112@gmail.com>
2 6
3 * progmodes/python.el (python-font-lock-keywords): Add Python 2.7 7 * progmodes/python.el (python-font-lock-keywords): Add Python 2.7
diff --git a/lisp/simple.el b/lisp/simple.el
index 51b33ad4fc6..89b33e9e4eb 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -3629,9 +3629,9 @@ point otherwise."
3629This is used by commands that act specially on the region under 3629This is used by commands that act specially on the region under
3630Transient Mark mode. 3630Transient Mark mode.
3631 3631
3632The return value is t provided Transient Mark mode is enabled and 3632The return value is t if Transient Mark mode is enabled and the
3633the mark is active; and, when `use-empty-active-region' is 3633mark is active; furthermore, if `use-empty-active-region' is
3634non-nil, provided the region is empty. Otherwise, the return 3634non-nil, the region must not be empty. Otherwise, the return
3635value is nil. 3635value is nil.
3636 3636
3637For some commands, it may be appropriate to ignore the value of 3637For some commands, it may be appropriate to ignore the value of