From: Eli Zaretskii <eliz@gnu.org>
Date: Mon, 20 Mar 2006 20:34:16 +0000 (+0000)
Subject: (main): Fix last change.
X-Git-Tag: emacs-pretest-22.0.90~3490
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e291625152dcaa94337755752ab1c20ec8decd32;p=emacs.git

(main): Fix last change.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 901ca108b1e..695d72d10a3 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2006-03-20  Eli Zaretskii  <eliz@gnu.org>
+
+	* emacs.c (main): Fix last change.
+
 2006-03-20  Kenichi Handa  <handa@m17n.org>
 
 	* fileio.c (Fwrite_region): Set visit_file to Qnil before GCPRO
diff --git a/src/emacs.c b/src/emacs.c
index 259c8c3381e..62a23f70859 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -1488,7 +1488,7 @@ main (argc, argv
     skip_args = count_before;
 
     /* Do not be lenient if the user explicitly asked for a named display.  */
-    if (display_arg != 1 && !x_display_ok (displayname))
+    if (display_arg == 1 && !x_display_ok (displayname))
       {
 	fprintf (stderr, "Display %s unavailable, simulating -nw\n",
 		 displayname);