aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2006-03-20 20:34:16 +0000
committerEli Zaretskii2006-03-20 20:34:16 +0000
commite291625152dcaa94337755752ab1c20ec8decd32 (patch)
tree51e9e3c31b5860222058c76beadbe30e8db304dd
parent3b4a1f681ea69575366caecf5db3db7a6b1b7ee1 (diff)
downloademacs-e291625152dcaa94337755752ab1c20ec8decd32.tar.gz
emacs-e291625152dcaa94337755752ab1c20ec8decd32.zip
(main): Fix last change.
-rw-r--r--src/ChangeLog4
-rw-r--r--src/emacs.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 901ca108b1e..695d72d10a3 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12006-03-20 Eli Zaretskii <eliz@gnu.org>
2
3 * emacs.c (main): Fix last change.
4
12006-03-20 Kenichi Handa <handa@m17n.org> 52006-03-20 Kenichi Handa <handa@m17n.org>
2 6
3 * fileio.c (Fwrite_region): Set visit_file to Qnil before GCPRO 7 * 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
1488 skip_args = count_before; 1488 skip_args = count_before;
1489 1489
1490 /* Do not be lenient if the user explicitly asked for a named display. */ 1490 /* Do not be lenient if the user explicitly asked for a named display. */
1491 if (display_arg != 1 && !x_display_ok (displayname)) 1491 if (display_arg == 1 && !x_display_ok (displayname))
1492 { 1492 {
1493 fprintf (stderr, "Display %s unavailable, simulating -nw\n", 1493 fprintf (stderr, "Display %s unavailable, simulating -nw\n",
1494 displayname); 1494 displayname);