[Emacs-diffs] Changes to emacs/lisp/faces.el,v

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        07/11/09 19:41:45

Index: faces.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/faces.el,v
retrieving revision 1.382
retrieving revision 1.383
diff -u -b -r1.382 -r1.383
--- faces.el    29 Oct 2007 13:54:00 -0000      1.382
+++ faces.el    9 Nov 2007 19:41:43 -0000       1.383
@@ -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)