summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChong Yidong <cyd@gnu.org>2012-12-09 11:44:59 +0800
committerChong Yidong <cyd@gnu.org>2012-12-09 11:44:59 +0800
commit2c066ad3ae3723168aa1f333a98dabcd2ced5024 (patch)
treee47a258d9bc0cf5c3cd68393133a5e1ad03b9d75
parenta06ae17da2c6eb3c0e53fb3c9de555da71796af0 (diff)
downloademacs-2c066ad3ae3723168aa1f333a98dabcd2ced5024.tar.gz
* simple.el (set-mark-default-inactive): Mark for removal after 24.3.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/simple.el5
2 files changed, 8 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1efcd623e2a..37d6e340399 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-12-09 Chong Yidong <cyd@gnu.org>
+
+ * simple.el (set-mark-default-inactive): Mark as obsolete, for
+ removal after 24.3.
+
2012-12-08 Dani Moncayo <dmoncayo@gmail.com>
* simple.el (just-one-space): Doc fix.
diff --git a/lisp/simple.el b/lisp/simple.el
index 61a5a3ea10b..389df0cde4e 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -4135,11 +4135,12 @@ after C-u \\[set-mark-command]."
(defcustom set-mark-default-inactive nil
"If non-nil, setting the mark does not activate it.
-This causes \\[set-mark-command] and \\[exchange-point-and-mark] to
-behave the same whether or not `transient-mark-mode' is enabled."
+This option does the same thing as disabling Transient Mark mode,
+and it will be removed in the near future."
:type 'boolean
:group 'editing-basics
:version "23.1")
+(make-obsolete-variable 'set-mark-default-inactive nil "24.3")
(defun set-mark-command (arg)
"Set the mark where point is, or jump to the mark.