aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan D2010-09-02 12:54:43 +0200
committerJan D2010-09-02 12:54:43 +0200
commit08d4877ef2d8c871cbbdab210ed21228687da036 (patch)
tree764de241cc961a6b91acf36f78f1d1152eb62773
parent30641319d8b68c3a76b8ec7b5bf850e0bbec13bb (diff)
downloademacs-08d4877ef2d8c871cbbdab210ed21228687da036.tar.gz
emacs-08d4877ef2d8c871cbbdab210ed21228687da036.zip
* 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 868a8e303b4..bee82633f39 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
12010-09-02 Jan Djärv <jan.h.d@swipnet.se> 12010-09-02 Jan Djärv <jan.h.d@swipnet.se>
2 2
3 * simple.el (kill-new): Call interprogram-cut-function with only
4 one argument.
5
3 * term.el (term-mouse-paste): Don't call x-get-cutbuffer. 6 * term.el (term-mouse-paste): Don't call x-get-cutbuffer.
4 Remove cut buffer from error message. 7 Remove cut buffer from error message.
5 8
diff --git a/lisp/simple.el b/lisp/simple.el
index 9ad776cad08..60d82dd3a48 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -3047,7 +3047,7 @@ argument should still be a \"useful\" string for such uses."
3047 (setcdr (nthcdr (1- kill-ring-max) kill-ring) nil)))) 3047 (setcdr (nthcdr (1- kill-ring-max) kill-ring) nil))))
3048 (setq kill-ring-yank-pointer kill-ring) 3048 (setq kill-ring-yank-pointer kill-ring)
3049 (if interprogram-cut-function 3049 (if interprogram-cut-function
3050 (funcall interprogram-cut-function string (not replace)))) 3050 (funcall interprogram-cut-function string)))
3051 3051
3052(defun kill-append (string before-p &optional yank-handler) 3052(defun kill-append (string before-p &optional yank-handler)
3053 "Append STRING to the end of the latest kill in the kill ring. 3053 "Append STRING to the end of the latest kill in the kill ring.