aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan D <[email protected]>2010-09-02 12:54:43 +0200
committerJan D <[email protected]>2010-09-02 12:54:43 +0200
commit08d4877ef2d8c871cbbdab210ed21228687da036 (patch)
tree764de241cc961a6b91acf36f78f1d1152eb62773
parent30641319d8b68c3a76b8ec7b5bf850e0bbec13bb (diff)
* simple.el (kill-new): Call interprogram-cut-function with only one argument.
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/simple.el2
2 files changed, 4 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 868a8e303b..bee82633f3 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
2010-09-02 Jan Djärv <[email protected]>
+ * simple.el (kill-new): Call interprogram-cut-function with only
+ one argument.
+
* term.el (term-mouse-paste): Don't call x-get-cutbuffer.
Remove cut buffer from error message.
diff --git a/lisp/simple.el b/lisp/simple.el
index 9ad776cad0..60d82dd3a4 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -3047,7 +3047,7 @@ argument should still be a \"useful\" string for such uses."
(setcdr (nthcdr (1- kill-ring-max) kill-ring) nil))))
(setq kill-ring-yank-pointer kill-ring)
(if interprogram-cut-function
- (funcall interprogram-cut-function string (not replace))))
+ (funcall interprogram-cut-function string)))
(defun kill-append (string before-p &optional yank-handler)
"Append STRING to the end of the latest kill in the kill ring.