Mercurial > emacs

changeset 9681:06061a86c50a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make previous change conditional.
author Karl Heuer <kwzh@gnu.org>
date Mon, 24 Oct 1994 23:30:14 +0000
parents 14a8113d8a8b
children 976ef7da7753
files lisp/term/x-win.el
diffstat 1 files changed, 12 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/term/x-win.el	Mon Oct 24 21:59:55 1994 +0000
+++ b/lisp/term/x-win.el	Mon Oct 24 23:30:14 1994 +0000
@@ -624,11 +624,18 @@
       (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)