Mercurial > emacs
comparison lisp/term/x-win.el @ 9681:06061a86c50a
Make previous change conditional.
author | Karl Heuer <kwzh@gnu.org> |
---|---|
date | Mon, 24 Oct 1994 23:30:14 +0000 |
parents | 572b1f190d15 |
children | bb1027a75918 |
comparison
equal
deleted
inserted
replaced
9680:14a8113d8a8b | 9681:06061a86c50a |
---|---|
622 ;; Change any . or * characters in x-resource-name to hyphens, | 622 ;; Change any . or * characters in x-resource-name to hyphens, |
623 ;; so as not to choke when we use it in X resource queries. | 623 ;; so as not to choke when we use it in X resource queries. |
624 (while (setq i (string-match "[.*]" x-resource-name)) | 624 (while (setq i (string-match "[.*]" x-resource-name)) |
625 (aset x-resource-name i ?-)))) | 625 (aset x-resource-name i ?-)))) |
626 | 626 |
627 (x-open-connection (or x-display-name | 627 ;; For the benefit of older Emacses (19.27 and earlier) that are sharing |
628 (setq x-display-name (getenv "DISPLAY"))) | 628 ;; the same lisp directory, don't pass the third argument unless we seem |
629 x-command-line-resources | 629 ;; to have the multi-display support. |
630 ;; Exit Emacs with fatal error if this fails. | 630 (if (fboundp 'x-close-connection) |
631 t) | 631 (x-open-connection (or x-display-name |
632 (setq x-display-name (getenv "DISPLAY"))) | |
633 x-command-line-resources | |
634 ;; Exit Emacs with fatal error if this fails. | |
635 t) | |
636 (x-open-connection (or x-display-name | |
637 (setq x-display-name (getenv "DISPLAY"))) | |
638 x-command-line-resources)) | |
632 | 639 |
633 (setq frame-creation-function 'x-create-frame-with-faces) | 640 (setq frame-creation-function 'x-create-frame-with-faces) |
634 | 641 |
635 (setq x-cut-buffer-max (min (- (/ (x-server-max-request-size) 2) 100) | 642 (setq x-cut-buffer-max (min (- (/ (x-server-max-request-size) 2) 100) |
636 x-cut-buffer-max)) | 643 x-cut-buffer-max)) |