[elpa] externals/xclip 1c536bb 05/18: * xclip.el: Fix last change

[Stefan Monnier]

branch: externals/xclip
commit 1c536bb5c7dbbe572e17e2c89c7c08e641ef9796
Author: Leo Liu <sdl.web@gmail.com>
Commit: Leo Liu <sdl.web@gmail.com>

    * xclip.el: Fix last change
---
 xclip.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xclip.el b/xclip.el
index bc9b640..fd1a748 100644
--- a/xclip.el
+++ b/xclip.el
@@ -5,7 +5,7 @@
 ;; Author: Leo Liu <sdl.web@gmail.com>
 ;; Keywords: convenience, tools
 ;; Created: 2007-12-30
-;; Version: 1.2
+;; Version: 1.3
 
 ;; This program is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
@@ -103,7 +103,7 @@ See also `x-set-selection'."
             nil)
            (t (setq xclip-last-selected-text-clipboard clip-text))))
     (or clip-text
-        (when (getenv "DISPLAY")
+        (when (and (not xclip-use-pbcopy&paste) (getenv "DISPLAY"))
           (let ((primary-text (with-output-to-string
                                 (process-file xclip-program nil
                                               standard-output nil "-o"))))