(interprogram-cut-function, interprogram-paste-function):

Don't make them frame-local any more.

2 files changed, 3 insertions, 4 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5876fda424f..91f99cf8545 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2007-11-09  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+        * simple.el (interprogram-cut-function, interprogram-paste-function):
+        Don't make them frame-local any more.
+
         * faces.el (x-create-frame-with-faces, tty-create-frame-with-faces):
         Don't set interprogram-(cut|paste)-function on each frame.
 
diff --git a/lisp/simple.el b/lisp/simple.el
index f43635807d0..572d7d689a7 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -2561,8 +2561,6 @@ 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.
 
@@ -2588,8 +2586,6 @@ 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)