aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKarl Heuer1995-05-31 21:18:55 +0000
committerKarl Heuer1995-05-31 21:18:55 +0000
commit1b4ec1c81b4d1b8b054dc3a077adc74ee3330f53 (patch)
treecb4081dfdf2ea700416aa9c80838b56fd330d1b8 /src
parent6103c44e5a46ec815db8b14635157bb4211eeb5b (diff)
downloademacs-1b4ec1c81b4d1b8b054dc3a077adc74ee3330f53.tar.gz
emacs-1b4ec1c81b4d1b8b054dc3a077adc74ee3330f53.zip
(x_display_info_for_name): Fix error message.
(Fx_open_connection): Fix error messages.
Diffstat (limited to 'src')
-rw-r--r--src/xfns.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/xfns.c b/src/xfns.c
index abc64d6944d..8ddd363d358 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -4591,7 +4591,7 @@ x_display_info_for_name (name)
4591 (char *) XSTRING (Vx_resource_name)->data); 4591 (char *) XSTRING (Vx_resource_name)->data);
4592 4592
4593 if (dpyinfo == 0) 4593 if (dpyinfo == 0)
4594 error ("X server %s not responding", XSTRING (name)->data); 4594 error ("Cannot connect to X server %s", XSTRING (name)->data);
4595 4595
4596 x_in_use = 1; 4596 x_in_use = 1;
4597 XSETFASTINT (Vwindow_system_version, 11); 4597 XSETFASTINT (Vwindow_system_version, 11);
@@ -4634,11 +4634,13 @@ terminate Emacs if we can't open the connection.")
4634 if (dpyinfo == 0) 4634 if (dpyinfo == 0)
4635 { 4635 {
4636 if (!NILP (must_succeed)) 4636 if (!NILP (must_succeed))
4637 fatal ("X server %s not responding.\n\ 4637 fatal ("Cannot connect to X server %s.\n\
4638Check the DISPLAY environment variable or use \"-d\"\n", 4638Check the DISPLAY environment variable or use `-d'.\n\
4639Also use the `xhost' program to verify that it is set to permit\n\
4640connections from your machine.\n",
4639 XSTRING (display)->data); 4641 XSTRING (display)->data);
4640 else 4642 else
4641 error ("X server %s not responding", XSTRING (display)->data); 4643 error ("Cannot connect to X server %s", XSTRING (display)->data);
4642 } 4644 }
4643 4645
4644 x_in_use = 1; 4646 x_in_use = 1;