[ELPA-diffs] ELPA branch, master, updated. 675826ae239d2fd710ffcc57e1b4cbb2fc300542

[Leo Liu]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "ELPA".

The branch, master has been updated
       via  675826ae239d2fd710ffcc57e1b4cbb2fc300542 (commit)
      from  f160382d9dd3acb36f562e82993e07765411c354 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 675826ae239d2fd710ffcc57e1b4cbb2fc300542
Author: Leo Liu <address@hidden>
Date:   Fri Sep 6 23:00:02 2013 +0800

    * xclip.el: Fix last change

diff --git a/packages/xclip/xclip.el b/packages/xclip/xclip.el
index bc9b640..fd1a748 100644
--- a/packages/xclip/xclip.el
+++ b/packages/xclip/xclip.el
@@ -5,7 +5,7 @@
 ;; Author: Leo Liu <address@hidden>
 ;; 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"))))

-----------------------------------------------------------------------

Summary of changes:
 packages/xclip/xclip.el |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
ELPA