From 0013b70f1d9d20073573c7f2c6d0d3dacc8b7270 Mon Sep 17 00:00:00 2001
From: Chong Yidong <cyd@stupidchicken.com>
Date: Sat, 18 Jul 2009 04:37:52 +0000
Subject: [PATCH] * simple.el (set-mark): Revert last change.
---
lisp/ChangeLog | 4 ++++
lisp/simple.el | 8 ++------
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5b899c35ca0..bc1384eda79 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2009-07-18 David De La Harpe Golden <david@harpegolden.net>
+
+ * simple.el (set-mark): Revert last change.
+
2009-07-17 Tassilo Horn <tassilo@member.fsf.org>
* doc-view.el (doc-view-initiate-display): Add yes-or-no-p if
diff --git a/lisp/simple.el b/lisp/simple.el
index 1e0f83152cf..50e4ac5b4a8 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -3534,12 +3534,8 @@ store it in a Lisp variable. Example:
(progn
(setq mark-active t)
(run-hooks 'activate-mark-hook)
- (and select-active-regions
- ;; Only set the selection if we already own PRIMARY. The
- ;; initial selection grab happens in `activate-mark', but
- ;; it is necessary to update it here.
- (x-selection-owner-p 'PRIMARY)
- (x-set-selection 'PRIMARY (current-buffer)))
+ (when select-active-regions
+ (x-set-selection 'PRIMARY (current-buffer)))
(set-marker (mark-marker) pos (current-buffer)))
;; Normally we never clear mark-active except in Transient Mark mode.
;; But when we actually clear out the mark value too, we must
--
2.39.5