From 5dea55d2fa53b12d088ac2ed7dd695a7fdf392b8 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Sun, 9 Dec 2012 11:40:09 +0800 Subject: [PATCH] * simple.el (set-mark-default-inactive): Delete accidentally-introduced option. (set-mark-command, exchange-point-and-mark): Remove calls. --- etc/NEWS | 4 ++++ lisp/ChangeLog | 6 ++++++ lisp/simple.el | 12 +----------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/etc/NEWS b/etc/NEWS index 361e49afe04..acfc18bb9e0 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -29,6 +29,10 @@ so we will look at it and add it to the manual. ** `eval-defun' on an already defined defcustom calls the :set function, if there is one. +** The option `set-mark-default-inactive' has been deleted. +This unfinished feature was introduced by accident in Emacs 23.1; +simply disabling Transient Mark mode does the same thing. + * Editing Changes in Emacs 24.4 diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8515c110c42..e7d8f0652cc 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2012-12-09 Chong Yidong + + * simple.el (set-mark-default-inactive): Delete this + accidentally-introduced option. + (set-mark-command, exchange-point-and-mark): Remove calls. + 2012-12-09 Glenn Morris * emacs-lisp/lisp-mode.el (eval-defun-1): Doc fix. diff --git a/lisp/simple.el b/lisp/simple.el index c86f367c8a8..51e676faffa 100644 --- a/lisp/simple.el +++ b/lisp/simple.el @@ -4134,14 +4134,6 @@ after C-u \\[set-mark-command]." :type 'boolean :group 'editing-basics) -(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." - :type 'boolean - :group 'editing-basics - :version "23.1") - (defun set-mark-command (arg) "Set the mark where point is, or jump to the mark. Setting the mark also alters the region, which is the text @@ -4203,8 +4195,7 @@ purposes. See the documentation of `set-mark' for more information." (activate-mark) (message "Mark activated"))) (t - (push-mark-command nil) - (if set-mark-default-inactive (deactivate-mark))))) + (push-mark-command nil)))) (defun push-mark (&optional location nomsg activate) "Set mark at LOCATION (point, by default) and push old mark on mark ring. @@ -4268,7 +4259,6 @@ mode temporarily." (deactivate-mark) (set-mark (point)) (goto-char omark) - (if set-mark-default-inactive (deactivate-mark)) (cond (temp-highlight (setq transient-mark-mode (cons 'only transient-mark-mode))) ((or (and arg (region-active-p)) ; (xor arg (not (region-active-p))) -- 2.39.5