From: Jan D Date: Thu, 2 Sep 2010 10:54:43 +0000 (+0200) Subject: * simple.el (kill-new): Call interprogram-cut-function with only one argument. X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~48^2~127 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=08d4877ef2d8c871cbbdab210ed21228687da036;p=emacs.git * simple.el (kill-new): Call interprogram-cut-function with only one argument. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 868a8e303b4..bee82633f39 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2010-09-02 Jan Djärv + * 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 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." (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.