# HG changeset patch
# User Dan Nicolaescu <dann@ics.uci.edu>
# Date 1229043271 0
# Node ID c611d83003ce08556993225882250e7fb0f9f9f7
# Parent  d07dbc338a2d918c27affdde8883ec8231cba94b
(init_tty): Move setting the terminal name before the
potential user: maybe_fatal.

diff -r d07dbc338a2d -r c611d83003ce src/ChangeLog
--- a/src/ChangeLog	Fri Dec 12 00:49:39 2008 +0000
+++ b/src/ChangeLog	Fri Dec 12 00:54:31 2008 +0000
@@ -1,3 +1,8 @@
+2008-12-12  Dan Nicolaescu  <dann@ics.uci.edu>
+
+	* term.c (init_tty): Move setting the terminal name before the
+	potential user: maybe_fatal.
+
 2008-12-11  Chong Yidong  <cyd@stupidchicken.com>
 
 	* term.c (tty_free_frame_resources): Renamed from
diff -r d07dbc338a2d -r c611d83003ce src/term.c
--- a/src/term.c	Fri Dec 12 00:49:39 2008 +0000
+++ b/src/term.c	Fri Dec 12 00:54:31 2008 +0000
@@ -3402,6 +3402,9 @@
       fd = emacs_open (name, O_RDWR | O_NOCTTY, 0);
 #endif /* O_IGNORE_CTTY */
 
+    tty->name = xstrdup (name);
+    terminal->name = xstrdup (name);
+
     if (fd < 0)
       maybe_fatal (must_succeed, terminal,
                    "Could not open file: %s",
@@ -3422,8 +3425,6 @@
 #endif
 
     file = fdopen (fd, "w+");
-    tty->name = xstrdup (name);
-    terminal->name = xstrdup (name);
     tty->input = file;
     tty->output = file;
   }