# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1194641729 0
# Node ID 12109b56601ff8f545c41eb52528bfeaf694a601
# Parent  79b1a2c5b3cb1c6159c8dfcb1fbf8bc6a177d8d5
(interprogram-cut-function, interprogram-paste-function):
Don't make them frame-local any more.

diff -r 79b1a2c5b3cb -r 12109b56601f lisp/ChangeLog
--- a/lisp/ChangeLog	Fri Nov 09 19:41:44 2007 +0000
+++ b/lisp/ChangeLog	Fri Nov 09 20:55:29 2007 +0000
@@ -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 -r 79b1a2c5b3cb -r 12109b56601f lisp/simple.el
--- a/lisp/simple.el	Fri Nov 09 19:41:44 2007 +0000
+++ b/lisp/simple.el	Fri Nov 09 20:55:29 2007 +0000
@@ -2561,8 +2561,6 @@
 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 @@
 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)