aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/term
diff options
context:
space:
mode:
authorGlenn Morris2016-12-10 18:11:56 -0800
committerGlenn Morris2016-12-10 18:11:56 -0800
commit442e2f61b742b315bbaec81085df9ee4e79495b1 (patch)
treeaf474050608a52a422c8918cc7ca720e515d8415 /lisp/term
parente4ac4507968b839569b5ce12a9c4d0374dd46768 (diff)
downloademacs-442e2f61b742b315bbaec81085df9ee4e79495b1.tar.gz
emacs-442e2f61b742b315bbaec81085df9ee4e79495b1.zip
Fixes related to select-enable-clipboard
* lisp/menu-bar.el (clipboard-yank, clipboard-kill-ring-save) (clipboard-kill-region): * lisp/eshell/esh-io.el (eshell-virtual-targets) (eshell-clipboard-append): Replace option gui-select-enable-clipboard with select-enable-clipboard; renamed October 2014. (Bug#25145)
Diffstat (limited to 'lisp/term')
-rw-r--r--lisp/term/pc-win.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/term/pc-win.el b/lisp/term/pc-win.el
index 8ca98c6ec91..85c4144ad22 100644
--- a/lisp/term/pc-win.el
+++ b/lisp/term/pc-win.el
@@ -263,7 +263,7 @@ Consult the selection. Treat empty strings as if they were unset."
263 (if (w16-selection-owner-p selection) 263 (if (w16-selection-owner-p selection)
264 t) 264 t)
265 ;; FIXME: Other systems don't obey 265 ;; FIXME: Other systems don't obey
266 ;; gui-select-enable-clipboard here. 266 ;; select-enable-clipboard here.
267 (with-demoted-errors "w16-set-clipboard-data: %S" 267 (with-demoted-errors "w16-set-clipboard-data: %S"
268 (w16-set-clipboard-data value)) 268 (w16-set-clipboard-data value))
269 value)) 269 value))