* 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

3 files changed, 27 insertions, 24 deletions

diff --git a/lisp/term/pc-win.el b/lisp/term/pc-win.el
index b224d6820f9..90eb14aab25 100644
--- a/lisp/term/pc-win.el
+++ b/lisp/term/pc-win.el
@@ -1,4 +1,4 @@
-;;; pc-win.el --- setup support for `PC windows' (whatever that is)
+;;; pc-win.el --- setup support for `PC windows' (whatever that is)  -*- lexical-binding:t -*-
 
 ;; Copyright (C) 1994, 1996-1997, 1999, 2001-2014 Free Software
 ;; Foundation, Inc.
@@ -45,20 +45,20 @@
 (declare-function w16-get-clipboard-data "w16select.c")
 (declare-function msdos-setup-keyboard "internal" (frame))
 
-;;; This was copied from etc/rgb.txt, except that some values were changed
-;;; a bit to make them consistent with DOS console colors, and the RGB
-;;; values were scaled up to 16 bits, as `tty-define-color' requires.
+;; This was copied from etc/rgb.txt, except that some values were changed
+;; a bit to make them consistent with DOS console colors, and the RGB
+;; values were scaled up to 16 bits, as `tty-define-color' requires.
 ;;;
-;;; The mapping between the 16 standard EGA/VGA colors and X color names
-;;; was done by running a Unix version of Emacs inside an X client and a
-;;; DJGPP-compiled Emacs on the same PC.  The names of X colors used to
-;;; define the pixel values are shown as comments to each color below.
+;; The mapping between the 16 standard EGA/VGA colors and X color names
+;; was done by running a Unix version of Emacs inside an X client and a
+;; DJGPP-compiled Emacs on the same PC.  The names of X colors used to
+;; define the pixel values are shown as comments to each color below.
 ;;;
-;;; If you want to change the RGB values, keep in mind that various pieces
-;;; of Emacs think that a color whose RGB values add up to less than 0.6 of
-;;; the values for WHITE (i.e. less than 117963) are ``dark'', otherwise the
-;;; color is ``light''; see `frame-set-background-mode' in lisp/faces.el for
-;;; an example.
+;; If you want to change the RGB values, keep in mind that various pieces
+;; of Emacs think that a color whose RGB values add up to less than 0.6 of
+;; the values for WHITE (i.e. less than 117963) are ``dark'', otherwise the
+;; color is ``light''; see `frame-set-background-mode' in lisp/faces.el for
+;; an example.
 (defvar msdos-color-values
   '(("black"          0     0     0     0)
     ("blue"           1     0     0 52480) ; MediumBlue
@@ -226,15 +226,17 @@ Consult the selection.  Treat empty strings as if they were unset."
   (with-demoted-errors "w16-get-clipboard-data:%s"
     (w16-get-clipboard-data)))
 
+(declare-function w16-selection-exists-p "w16select.c")
 ;; gui-selection-owner-p is used in simple.el.
 (gui-method-define gui-selection-exists-p pc #'w16-selection-exists-p)
 (gui-method-define gui-selection-owner-p pc #'w16-selection-owner-p)
+
 (defun w16-selection-owner-p (_selection)
-  ;; FIXME: Other systems don't obey gui-select-enable-clipboard here.
-  (if gui-select-enable-clipboard
+  ;; FIXME: Other systems don't obey select-enable-clipboard here.
+  (if select-enable-clipboard
       (let ((text
              ;; Don't die if w16-get-clipboard-data signals an error.
-             (ignore-errors
+             (with-demoted-errors "w16-get-clipboard-data: %S"
                (w16-get-clipboard-data))))
         ;; We consider ourselves the owner of the selection
         ;; if it does not exist, or exists and compares
@@ -242,9 +244,7 @@ Consult the selection.  Treat empty strings as if they were unset."
         ;; Windows clipboard.
         (cond
          ((not text) t)
-         ((or (eq text gui-last-selected-text)
-              (string= text gui-last-selected-text))
-          text)
+         ((equal text gui--last-selected-text-clipboard) text)
          (t nil)))))
 
 ;; gui-set-selection is used in gui-set-selection.
diff --git a/lisp/term/w32-win.el b/lisp/term/w32-win.el
index 063acd7e8bb..bb9a7e481a2 100644
--- a/lisp/term/w32-win.el
+++ b/lisp/term/w32-win.el
@@ -211,6 +211,8 @@ See the documentation of `create-fontset-from-fontset-spec' for the format.")
 
 (defvar dynamic-library-alist)
 (defvar libpng-version)                 ; image.c #ifdef HAVE_NTGUI
+(defvar libgif-version)
+(defvar libjpeg-version)
 
 ;;; Set default known names for external libraries
 (setq dynamic-library-alist
@@ -381,12 +383,13 @@ See the documentation of `create-fontset-from-fontset-spec' for the format.")
 (declare-function w32-set-clipboard-data "w32select.c"
                   (string &optional ignored))
 (declare-function w32-get-clipboard-data "w32select.c")
+(declare-function w32-selection-exists-p "w32select.c")
 
 ;;; Fix interface to (X-specific) mouse.el
 (defun w32--set-selection (type value)
   (if (eq type 'CLIPBOARD)
-      (w32-set-clipboard-data text)
-    (put 'x-selections (or type 'PRIMARY) data)))
+      (w32-set-clipboard-data value)
+    (put 'x-selections (or type 'PRIMARY) value)))
 
 (defun w32--get-selection  (&optional type data-type)
   (if (and (eq type 'CLIPBOARD)
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)))