diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2014-10-22 21:38:59 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2014-10-22 21:38:59 -0400 |
| commit | d361bcfbc7a69737ccd383e127fc8744c80cf5b4 (patch) | |
| tree | 0a900898735e6daefe02ead8f846fe1c37f3539a /lisp/term/x-win.el | |
| parent | 6a7884caf2a6f4a7fb7faa9ba275163d40f6bd96 (diff) | |
| download | emacs-d361bcfbc7a69737ccd383e127fc8744c80cf5b4.tar.gz | |
* lisp/select.el: Use lexical-binding.
(gui-set-selection): Provide an implementation for non-GUI frames.
* lisp/term/x-win.el: Use lexical-binding.
(x-clipboard-yank): Fix up missed renamings.
* lisp/term/w32-win.el (libgif-version, libjpeg-version): Silence compiler.
(w32--set-selection): Fix up var names.
* lisp/term/pc-win.el: Use lexical-binding.
(w16-selection-exists-p): Silence compiler warning.
(w16-selection-owner-p): Fix up missed renamings.
* lisp/emacs-lisp/bytecomp.el (byte-compile-form): Remove left-over debug.
* lisp/frame.el (frame-notice-user-settings): Fix excessive quoting.
Fixes: debbugs:18791
Diffstat (limited to 'lisp/term/x-win.el')
| -rw-r--r-- | lisp/term/x-win.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el index ebc34d3fdd6..a54846c7d7c 100644 --- a/lisp/term/x-win.el +++ b/lisp/term/x-win.el @@ -1,4 +1,4 @@ -;;; x-win.el --- parse relevant switches and set up for X -*-coding: iso-2022-7bit;-*- +;;; x-win.el --- parse relevant switches and set up for X -*-coding: iso-2022-7bit; lexical-binding:t -*- ;; Copyright (C) 1993-1994, 2001-2014 Free Software Foundation, Inc. @@ -1163,8 +1163,8 @@ as returned by `x-server-vendor'." "Insert the clipboard contents, or the last stretch of killed text." (declare (obsolete clipboard-yank "25.1")) (interactive "*") - (let ((clipboard-text (x-selection-value-internal 'CLIPBOARD)) - (x-select-enable-clipboard t)) + (let ((clipboard-text (gui--selection-value-internal 'CLIPBOARD)) + (select-enable-clipboard t)) (if (and clipboard-text (> (length clipboard-text) 0)) (kill-new clipboard-text)) (yank))) |