comparison lisp/term/x-win.el @ 2718:c91b18333f58

* x-win.el: Since we require faces.el, there's no point in setting frame-creation-function to x-create-frame - just set it directly to x-create-frame-with-faces. * x-win.el: (require 'faces), too. Move (require 'select) to top, with the other requires.
author Jim Blandy <jimb@redhat.com>
date Sun, 09 May 1993 23:54:12 +0000
parents 7fe45a326a98
children b809a8da05cb
comparison
equal deleted inserted replaced
2717:67f34b0bc2d1 2718:c91b18333f58
68 (error "Loading x-win.el but not compiled for X")) 68 (error "Loading x-win.el but not compiled for X"))
69 69
70 (require 'frame) 70 (require 'frame)
71 (require 'mouse) 71 (require 'mouse)
72 (require 'scroll-bar) 72 (require 'scroll-bar)
73 (require 'faces)
74 (require 'select)
73 75
74 (setq command-switch-alist 76 (setq command-switch-alist
75 (append '(("-bw" . x-handle-numeric-switch) 77 (append '(("-bw" . x-handle-numeric-switch)
76 ("-d" . x-handle-display) 78 ("-d" . x-handle-display)
77 ("-display" . x-handle-display) 79 ("-display" . x-handle-display)
501 503
502 (setq command-line-args (x-handle-args command-line-args)) 504 (setq command-line-args (x-handle-args command-line-args))
503 (x-open-connection (or x-display-name 505 (x-open-connection (or x-display-name
504 (setq x-display-name (getenv "DISPLAY")))) 506 (setq x-display-name (getenv "DISPLAY"))))
505 507
506 (setq frame-creation-function 'x-create-frame) 508 (setq frame-creation-function 'x-create-frame-with-faces)
507 509
508 (defun x-win-suspend-error () 510 (defun x-win-suspend-error ()
509 (error "Suspending an emacs running under X makes no sense")) 511 (error "Suspending an emacs running under X makes no sense"))
510 (add-hook 'suspend-hook 'x-win-suspend-error) 512 (add-hook 'suspend-hook 'x-win-suspend-error)
511 513
512 (require 'select)
513
514 ;;; Arrange for the kill and yank functions to set and check the clipboard. 514 ;;; Arrange for the kill and yank functions to set and check the clipboard.
515 (setq interprogram-cut-function 'x-select-text) 515 (setq interprogram-cut-function 'x-select-text)
516 (setq interprogram-paste-function 'x-cut-buffer-or-selection-value) 516 (setq interprogram-paste-function 'x-cut-buffer-or-selection-value)
517 517
518 ;;; Turn off window-splitting optimization; X is usually fast enough 518 ;;; Turn off window-splitting optimization; X is usually fast enough