Mercurial > emacs
changeset 85996:79b1a2c5b3cb
(x-create-frame-with-faces, tty-create-frame-with-faces):
Don't set interprogram-(cut|paste)-function on each frame.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Fri, 09 Nov 2007 19:41:44 +0000 |
| parents | 898d36ac44d1 |
| children | 12109b56601f |
| files | lisp/ChangeLog lisp/faces.el |
| diffstat | 2 files changed, 3 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Fri Nov 09 19:37:03 2007 +0000 +++ b/lisp/ChangeLog Fri Nov 09 19:41:44 2007 +0000 @@ -1,5 +1,8 @@ 2007-11-09 Stefan Monnier <monnier@iro.umontreal.ca> + * 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):
--- a/lisp/faces.el Fri Nov 09 19:37:03 2007 +0000 +++ b/lisp/faces.el Fri Nov 09 19:41:44 2007 +0000 @@ -1905,11 +1905,6 @@ (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 @@ (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)