aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJim Blandy1992-11-05 04:28:10 +0000
committerJim Blandy1992-11-05 04:28:10 +0000
commit2fb263f61e44e4155588f3fe7987336da1f76878 (patch)
treeb466e790222db5c53c20995b1463c922bb50c6f9
parentcf7a78db1d8fe2d445699959e3ea210f4f7fbac7 (diff)
downloademacs-2fb263f61e44e4155588f3fe7987336da1f76878.tar.gz
emacs-2fb263f61e44e4155588f3fe7987336da1f76878.zip
*** empty log message ***
-rw-r--r--lisp/term/x-win.el26
1 files changed, 15 insertions, 11 deletions
diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el
index 7fb3276b8d7..d570e4834d7 100644
--- a/lisp/term/x-win.el
+++ b/lisp/term/x-win.el
@@ -449,18 +449,9 @@ turn off scroll bars; otherwise, turn on scroll bars."
449(define-key global-map [end] 'end-of-buffer) 449(define-key global-map [end] 'end-of-buffer)
450 450
451(define-key global-map "\C-z" 'iconify-frame) 451(define-key global-map "\C-z" 'iconify-frame)
452
453;;; Do the actual X Windows setup here; the above code just defines
454;;; functions and variables that we use now.
455
456(setq command-line-args (x-handle-args command-line-args))
457(x-open-connection (or x-display-name
458 (setq x-display-name (getenv "DISPLAY"))))
459 452
460(setq frame-creation-function 'x-create-frame) 453
461(setq suspend-hook 454;;;; Selections and cut buffers
462 '(lambda ()
463 (error "Suspending an emacs running under X makes no sense")))
464 455
465;;; We keep track of the last text selected here, so we can check the 456;;; We keep track of the last text selected here, so we can check the
466;;; current selection against it, and avoid passing back our own text 457;;; current selection against it, and avoid passing back our own text
@@ -501,6 +492,19 @@ turn off scroll bars; otherwise, turn on scroll bars."
501 (t 492 (t
502 (setq x-last-selected-text text))))) 493 (setq x-last-selected-text text)))))
503 494
495
496;;; Do the actual X Windows setup here; the above code just defines
497;;; functions and variables that we use now.
498
499(setq command-line-args (x-handle-args command-line-args))
500(x-open-connection (or x-display-name
501 (setq x-display-name (getenv "DISPLAY"))))
502
503(setq frame-creation-function 'x-create-frame)
504(setq suspend-hook
505 '(lambda ()
506 (error "Suspending an emacs running under X makes no sense")))
507
504;;; Arrange for the kill and yank functions to set and check the clipboard. 508;;; Arrange for the kill and yank functions to set and check the clipboard.
505(setq interprogram-cut-function 'x-select-text) 509(setq interprogram-cut-function 'x-select-text)
506(setq interprogram-paste-function 'x-cut-buffer-or-selection-value) 510(setq interprogram-paste-function 'x-cut-buffer-or-selection-value)