* simple.el (set-mark): Revert last change.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5b899c35ca09582867da85b8c50affde3cea0b6f..bc1384eda79f20c1afc7aa87a8015b515fbdc6e2 100644 (file)
--- 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 1e0f83152cfb5708ce686a83f2a9f7b992fcf79c..50e4ac5b4a859f7735dea6173af71d64ec0f647a 100644 (file)
--- 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