aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/eshell
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/eshell')
-rw-r--r--lisp/eshell/esh-io.el6
1 files changed, 2 insertions, 4 deletions
diff --git a/lisp/eshell/esh-io.el b/lisp/eshell/esh-io.el
index b7830db08b5..ebbca58a442 100644
--- a/lisp/eshell/esh-io.el
+++ b/lisp/eshell/esh-io.el
@@ -118,8 +118,6 @@ from executing while Emacs is redisplaying."
118 :type 'integer 118 :type 'integer
119 :group 'eshell-io) 119 :group 'eshell-io)
120 120
121(defvar x-select-enable-clipboard) ; term/common-win
122
123(defcustom eshell-virtual-targets 121(defcustom eshell-virtual-targets
124 '(("/dev/eshell" eshell-interactive-print nil) 122 '(("/dev/eshell" eshell-interactive-print nil)
125 ("/dev/kill" (lambda (mode) 123 ("/dev/kill" (lambda (mode)
@@ -128,7 +126,7 @@ from executing while Emacs is redisplaying."
128 'eshell-kill-append) t) 126 'eshell-kill-append) t)
129 ("/dev/clip" (lambda (mode) 127 ("/dev/clip" (lambda (mode)
130 (if (eq mode 'overwrite) 128 (if (eq mode 'overwrite)
131 (let ((x-select-enable-clipboard t)) 129 (let ((gui-select-enable-clipboard t))
132 (kill-new ""))) 130 (kill-new "")))
133 'eshell-clipboard-append) t)) 131 'eshell-clipboard-append) t))
134 "Map virtual devices name to Emacs Lisp functions. 132 "Map virtual devices name to Emacs Lisp functions.
@@ -328,7 +326,7 @@ last execution result should not be changed."
328(defun eshell-clipboard-append (string) 326(defun eshell-clipboard-append (string)
329 "Call `kill-append' with STRING, if it is indeed a string." 327 "Call `kill-append' with STRING, if it is indeed a string."
330 (if (stringp string) 328 (if (stringp string)
331 (let ((x-select-enable-clipboard t)) 329 (let ((gui-select-enable-clipboard t))
332 (kill-append string nil)))) 330 (kill-append string nil))))
333 331
334(defun eshell-get-target (target &optional mode) 332(defun eshell-get-target (target &optional mode)