Fix cut'n'paste during a multi-display session (Mark Plaksin, Robert Chassell).

lisp/simple.el: Make interprogram-cut-function and
interprogram-paste-function frame-local.  (Reported by Mark Plaksin
and Robert Chassell).

lisp/faces.el (x-create-frame-with-faces)
(tty-create-frame-with-faces): Set the interprogram-cut-function and
interprogram-paste-function frame parameters.

lisp/x-win.el (x-initialize-window-system): Don't set
interprogram-cut-function and interprogram-paste-function.

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-124

3 files changed, 12 insertions, 4 deletions

diff --git a/lisp/faces.el b/lisp/faces.el
index c7123e0229e..2c9fbb8206e 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -1680,6 +1680,11 @@ Value is the new frame created."
           (if (or (null frame-list) (null visibility-spec))
               (make-frame-visible frame)
             (modify-frame-parameters frame (list visibility-spec)))
+          ;; Arrange for the kill and yank functions to set and check the clipboard.
+          (modify-frame-parameters
+           frame '((interprogram-cut-function . x-select-text)))
+          (modify-frame-parameters
+           frame '((interprogram-paste-function . x-cut-buffer-or-selection-value)))
           (setq success t))
       (unless success
         (delete-frame frame)))
@@ -1777,6 +1782,9 @@ created."
                       (if (setq hyphend (string-match "[-_][^-_]+$" term))
                           (substring term 0 hyphend)
                         nil)))))
+          ;; Make sure the kill and yank functions do not touch the X clipboard.
+          (modify-frame-parameters frame '((interprogram-cut-function . nil)))
+          (modify-frame-parameters frame '((interprogram-paste-function . nil)))
           (setq success t))
       (unless success
         (select-frame old-frame)
diff --git a/lisp/simple.el b/lisp/simple.el
index 6bc89ae1750..13cb63af240 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -1788,6 +1788,8 @@ the text which should be made available.
 The second, optional, argument PUSH, has the same meaning as the
 similar argument to `x-set-cut-buffer', which see.")
 
+(make-variable-frame-local 'interprogram-cut-function)
+
 (defvar interprogram-paste-function nil
   "Function to call to get text cut from other programs.
 
@@ -1808,6 +1810,8 @@ most recent string, the function should return nil.  If it is
 difficult to tell whether Emacs or some other program provided the
 current string, it is probably good enough to return nil if the string
 is equal (according to `string=') to the last text Emacs provided.")
+
+(make-variable-frame-local 'interprogram-paste-function)
 
 
 
diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el
index da5ac04a6c9..cd26352a962 100644
--- a/lisp/term/x-win.el
+++ b/lisp/term/x-win.el
@@ -2445,10 +2445,6 @@ order until succeed.")
   ;; Don't let Emacs suspend under X.
   (add-hook 'suspend-hook 'x-win-suspend-error)
 
-  ;; Arrange for the kill and yank functions to set and check the clipboard.
-  (setq interprogram-cut-function 'x-select-text)
-  (setq interprogram-paste-function 'x-cut-buffer-or-selection-value)
-
   ;; Turn off window-splitting optimization; X is usually fast enough
   ;; that this is only annoying.
   (setq split-window-keep-point t)