From: Glenn Morris <rgm@gnu.org>
Date: Wed, 18 Sep 2013 04:46:44 +0000 (-0700)
Subject: * term.el (term-mouse-paste): Reorder to silence --without-x compilation.
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~1547
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=45069b2e00c0b067da7a3ae730f9a3b0694a5826;p=emacs.git

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7ddc5425435..fd6d8f0a547 100644
--- 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 be080297b2e..d9ba848e8be 100644
--- 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 ()