emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] externals/xclip ef584a0 11/18: * xclip/xclip.el: Don't use remote


From: Stefan Monnier
Subject: [elpa] externals/xclip ef584a0 11/18: * xclip/xclip.el: Don't use remote processes to get selection
Date: Sat, 28 Nov 2020 14:27:56 -0500 (EST)

branch: externals/xclip
commit ef584a02efa17c07f7248ad045c5d891c5319803
Author: Stefan Monnier <monnier@iro.umontreal.ca>
Commit: Stefan Monnier <monnier@iro.umontreal.ca>

    * xclip/xclip.el: Don't use remote processes to get selection
    
    (xclip-get-selection, xclip-selection-value): Avoid process-file.
    Fixes bug#34798.
---
 xclip.el | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/xclip.el b/xclip.el
index b142475..6302ff9 100644
--- a/xclip.el
+++ b/xclip.el
@@ -1,11 +1,11 @@
 ;;; xclip.el --- Copy&paste GUI clipboard from text terminal  -*- 
lexical-binding:t -*-
 
-;; Copyright (C) 2007, 2012, 2013, 2017, 2018  Free Software Foundation, Inc.
+;; Copyright (C) 2007-2019  Free Software Foundation, Inc.
 
 ;; Author: Leo Liu <sdl.web@gmail.com>
 ;; Keywords: convenience, tools
 ;; Created: 2007-12-30
-;; Version: 1.7
+;; Version: 1.8
 
 ;; 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
@@ -144,21 +144,21 @@ See also `x-set-selection'."
       (pcase xclip-method
         (`pbpaste
          (when (memq type '(clipboard CLIPBOARD))
-           (process-file xclip-program nil standard-output nil
+           (call-process xclip-program nil standard-output nil
                          "-Prefer" "txt")))
         (`getclip
          (when (memq type '(clipboard CLIPBOARD))
-           (process-file xclip-program nil standard-output nil)))
+           (call-process xclip-program nil standard-output nil)))
         (`xclip
          (when (getenv "DISPLAY")
-           (process-file xclip-program nil standard-output nil
+           (call-process xclip-program nil standard-output nil
                          "-o" "-selection" (symbol-name type))))
         (`xsel
          (when (and (getenv "DISPLAY")
                     (memq type '(clipboard CLIPBOARD
                                  primary PRIMARY
                                  secondary SECONDARY)))
-           (process-file xclip-program nil standard-output nil
+           (call-process xclip-program nil standard-output nil
                          "-o" (concat "--" (downcase (symbol-name type))))))
         (method (error "Unknown `xclip-method': %S" method))))))
 
@@ -281,7 +281,7 @@ Emacs-NN and is then later run by Emacs>NN."
       (or clip-text
           (when (and (memq xclip-method '(xsel xclip)) (getenv "DISPLAY"))
             (let ((primary-text (with-output-to-string
-                                  (process-file xclip-program nil
+                                  (call-process xclip-program nil
                                                 standard-output nil "-o"))))
               (setq primary-text
                     (cond               ; Check primary selection.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]