* term.el (term-mouse-paste): Reorder to silence --without-x compilation.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7ddc54254359c56041acf00f85a1962a165fec9d..fd6d8f0a547bfbb736cbbede1c7744a4577dca17 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -6,6 +6,7 @@
        Remove --without-x warning/error.
 
        * mouse.el (mouse-yank-primary):
+       * term.el (term-mouse-paste):
        Reorder to silence --without-x compilation.
 
        * mpc.el (doc-view-mode): Silence --without-x compilation.

diff --git a/lisp/term.el b/lisp/term.el
index be080297b2e19474ac0c403109677b0dfa319f07..d9ba848e8be18f9a5f0fa6a01b5d4374a6a14386 100644 (file)
--- a/lisp/term.el
+++ b/lisp/term.el
@@ -1252,15 +1252,14 @@ without any interpretation."
     (setq this-command 'yank)
     (mouse-set-point click)
     (term-send-raw-string
-     (or (cond  ; From `mouse-yank-primary':
-         ((eq system-type 'windows-nt)
-          (or (x-get-selection 'PRIMARY)
-              (x-get-selection-value)))
-         ((fboundp 'x-get-selection-value)
-          (or (x-get-selection-value)
-              (x-get-selection 'PRIMARY)))
-         (t
-          (x-get-selection 'PRIMARY)))
+     ;; From `mouse-yank-primary':
+     (or (if (fboundp 'x-get-selection-value)
+             (if (eq system-type 'windows-nt)
+                 (or (x-get-selection 'PRIMARY)
+                     (x-get-selection-value))
+               (or (x-get-selection-value)
+                   (x-get-selection 'PRIMARY)))
+          (x-get-selection 'PRIMARY))
         (error "No selection is available")))))
 
 (defun term-paste ()