[Emacs-diffs] emacs/lisp simple.el

[Eli Zaretskii]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Eli Zaretskii <eliz>    09/07/18 19:03:53

Modified files:
        lisp           : simple.el 

Log message:
        (deactivate-mark, activate-mark, set-mark): Don't call x-set-selection
        if display-selections-p returns nil for the current frame.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/simple.el?cvsroot=emacs&r1=1.996&r2=1.997

Patches:
Index: simple.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/simple.el,v
retrieving revision 1.996
retrieving revision 1.997
diff -u -b -r1.996 -r1.997
--- simple.el   18 Jul 2009 17:39:38 -0000      1.996
+++ simple.el   18 Jul 2009 19:03:53 -0000      1.997
@@ -3489,6 +3489,7 @@
     ;; Copy the latest region into the primary selection, if desired.
     (and select-active-regions
         mark-active
+        (display-selections-p)
         (x-selection-owner-p 'PRIMARY)
         (x-set-selection 'PRIMARY (buffer-substring-no-properties
                                    (region-beginning) (region-end))))
@@ -3510,7 +3511,8 @@
     (setq mark-active t)
     (unless transient-mark-mode
       (setq transient-mark-mode 'lambda))
-    (when select-active-regions
+    (when (and select-active-regions
+              (display-selections-p))
       (x-set-selection 'PRIMARY (current-buffer)))))
 
 (defun set-mark (pos)
@@ -3534,7 +3536,8 @@
       (progn
        (setq mark-active t)
        (run-hooks 'activate-mark-hook)
-       (when select-active-regions
+       (when (and select-active-regions
+                  (display-selections-p))
          (x-set-selection 'PRIMARY (current-buffer)))
        (set-marker (mark-marker) pos (current-buffer)))
     ;; Normally we never clear mark-active except in Transient Mark mode.