diff options
| author | Jim Blandy | 1993-05-09 23:54:12 +0000 |
|---|---|---|
| committer | Jim Blandy | 1993-05-09 23:54:12 +0000 |
| commit | ffe1dd7ac1d406d2099f0cec753f9aa223610111 (patch) | |
| tree | 200d9980dddffe12692274914c666e09b69ee6ad | |
| parent | 4bf5153268486668a8585e7fa9c2f86a4679ae94 (diff) | |
| download | emacs-ffe1dd7ac1d406d2099f0cec753f9aa223610111.tar.gz emacs-ffe1dd7ac1d406d2099f0cec753f9aa223610111.zip | |
* 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.
| -rw-r--r-- | lisp/term/x-win.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el index 66aeef9de0a..38498eaef4b 100644 --- a/lisp/term/x-win.el +++ b/lisp/term/x-win.el | |||
| @@ -70,6 +70,8 @@ | |||
| 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) |
| @@ -503,14 +505,12 @@ This returns ARGS with the arguments that have been processed removed." | |||
| 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) |