From f1b648d6d0a8a9a26a50d077715689430f3bb8a7 Mon Sep 17 00:00:00 2001 From: Karl Heuer Date: Mon, 24 Oct 1994 23:30:14 +0000 Subject: Make previous change conditional. --- lisp/term/x-win.el | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'lisp/term') diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el index 07db0c5aa65..9752dc16364 100644 --- a/lisp/term/x-win.el +++ b/lisp/term/x-win.el @@ -624,11 +624,18 @@ This is in addition to the primary selection.") (while (setq i (string-match "[.*]" x-resource-name)) (aset x-resource-name i ?-)))) -(x-open-connection (or x-display-name - (setq x-display-name (getenv "DISPLAY"))) - x-command-line-resources - ;; Exit Emacs with fatal error if this fails. - t) +;; For the benefit of older Emacses (19.27 and earlier) that are sharing +;; the same lisp directory, don't pass the third argument unless we seem +;; to have the multi-display support. +(if (fboundp 'x-close-connection) + (x-open-connection (or x-display-name + (setq x-display-name (getenv "DISPLAY"))) + x-command-line-resources + ;; Exit Emacs with fatal error if this fails. + t) + (x-open-connection (or x-display-name + (setq x-display-name (getenv "DISPLAY"))) + x-command-line-resources)) (setq frame-creation-function 'x-create-frame-with-faces) -- cgit v1.2.1