From a3ee6f08ac597e9bcd12c3759c8419a51bf603a3 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Fri, 9 Nov 2007 19:41:44 +0000 Subject: [PATCH] (x-create-frame-with-faces, tty-create-frame-with-faces): Don't set interprogram-(cut|paste)-function on each frame. --- lisp/ChangeLog | 3 +++ lisp/faces.el | 9 --------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 7c60512ebc9..5876fda424f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2007-11-09 Stefan Monnier + * faces.el (x-create-frame-with-faces, tty-create-frame-with-faces): + Don't set interprogram-(cut|paste)-function on each frame. + * term/x-win.el (x-select-text, x-cut-buffer-or-selection-value): Make them work in tty frames. (interprogram-cut-function, interprogram-paste-function): diff --git a/lisp/faces.el b/lisp/faces.el index 83b69ca630f..a859c2658a4 100644 --- a/lisp/faces.el +++ b/lisp/faces.el @@ -1905,11 +1905,6 @@ Value is the new frame created." (x-handle-reverse-video frame parameters) (frame-set-background-mode frame) (face-set-after-frame-default frame) - ;; Arrange for the kill and yank functions to set and check the clipboard. - (modify-frame-parameters - frame '((interprogram-cut-function . x-select-text))) - (modify-frame-parameters - frame '((interprogram-paste-function . x-cut-buffer-or-selection-value))) ;; Make sure the tool-bar is ready to be enabled. The ;; `tool-bar-lines' frame parameter will not take effect ;; without this call. @@ -2012,10 +2007,6 @@ created." (with-selected-frame frame (tty-handle-reverse-video frame (frame-parameters frame)) - ;; Make sure the kill and yank functions do not touch the X clipboard. - (modify-frame-parameters frame '((interprogram-cut-function . nil))) - (modify-frame-parameters frame '((interprogram-paste-function . nil))) - (unless (terminal-parameter frame 'terminal-initted) (set-terminal-parameter frame 'terminal-initted t) (set-locale-environment nil frame) -- 2.39.2