# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1247891872 0
# Node ID c59b9da550fc93237c2b0c7617bc261681cda7b9
# Parent  fcd80b58a69401b2390785c7425b127f18655c13
* simple.el (set-mark): Revert last change.

diff -r fcd80b58a694 -r c59b9da550fc lisp/ChangeLog
--- a/lisp/ChangeLog	Sat Jul 18 02:22:57 2009 +0000
+++ b/lisp/ChangeLog	Sat Jul 18 04:37:52 2009 +0000
@@ -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 -r fcd80b58a694 -r c59b9da550fc lisp/simple.el
--- a/lisp/simple.el	Sat Jul 18 02:22:57 2009 +0000
+++ b/lisp/simple.el	Sat Jul 18 04:37:52 2009 +0000
@@ -3534,12 +3534,8 @@
       (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