Merged in changes from CVS trunk.

[gnu-emacs] / lisp / simple.el

diff --git a/lisp/simple.el b/lisp/simple.el
index 9f1bde393ee0eecbfd7a4cdf34b8ff8167c49d80..7465e33c8e9a45511ca39963683cc75fbb317cd5 100644 (file)
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -2094,6 +2094,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.
 
@@ -2114,6 +2116,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)
 \f