[Emacs-diffs] trunk r114362: * term.el (term-mouse-paste): Reorder to silence --without-x compilation.

[Glenn Morris]

------------------------------------------------------------
revno: 114362
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Tue 2013-09-17 21:46:44 -0700
message:
  * term.el (term-mouse-paste): Reorder to silence --without-x compilation.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/term.el                   term.el-20091113204419-o5vbwnq5f7feedwu-794

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-09-18 04:44:20 +0000
+++ b/lisp/ChangeLog    2013-09-18 04:46:44 +0000
@@ -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.

=== modified file 'lisp/term.el'
--- a/lisp/term.el      2013-09-13 13:22:47 +0000
+++ b/lisp/term.el      2013-09-18 04:46:44 +0000
@@ -1252,15 +1252,14 @@
     (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 ()