aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenichi Handa2005-06-10 01:52:13 +0000
committerKenichi Handa2005-06-10 01:52:13 +0000
commit63e88db35a9388d7f74266a72187ad3bf22656cc (patch)
tree32f6314167d652dc8a300cba08dad7a6ef4ecd54
parent63baed9942f0dfc4d8a5b58febc26bab3f0b88d4 (diff)
downloademacs-63e88db35a9388d7f74266a72187ad3bf22656cc.tar.gz
emacs-63e88db35a9388d7f74266a72187ad3bf22656cc.zip
(x-clipboard-yank): Use x-selection-value instead of x-get-selection.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/term/x-win.el2
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8f24016c348..e3d6cdc98d6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12005-06-10 Zhang Wei <id.brep@gmail.com> (tiny change)
2
3 * term/x-win.el (x-clipboard-yank): Use x-selection-value instead
4 of x-get-selection.
5
12005-06-10 Juanma Barranquero <lekktu@gmail.com> 62005-06-10 Juanma Barranquero <lekktu@gmail.com>
2 7
3 * comint.el (comint-mode, comint-snapshot-last-prompt): 8 * comint.el (comint-mode, comint-snapshot-last-prompt):
diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el
index 5b4ff6d2f7c..a4118029eaa 100644
--- a/lisp/term/x-win.el
+++ b/lisp/term/x-win.el
@@ -2467,7 +2467,7 @@ order until succeed.")
2467 (interactive) 2467 (interactive)
2468 (let ((clipboard-text 2468 (let ((clipboard-text
2469 (condition-case nil 2469 (condition-case nil
2470 (x-get-selection 'CLIPBOARD) 2470 (x-selection-value 'CLIPBOARD)
2471 (error nil))) 2471 (error nil)))
2472 (x-select-enable-clipboard t)) 2472 (x-select-enable-clipboard t))
2473 (if (and clipboard-text (> (length clipboard-text) 0)) 2473 (if (and clipboard-text (> (length clipboard-text) 0))