summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/ChangeLog5
-rw-r--r--src/term.c5
2 files changed, 8 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 6cf3d1610d8..daeca39e9bf 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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 --git a/src/term.c b/src/term.c
index fd1590547c1..4beb90dc014 100644
--- a/src/term.c
+++ b/src/term.c
@@ -3402,6 +3402,9 @@ init_tty (char *name, char *terminal_type, int must_succeed)
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 @@ init_tty (char *name, char *terminal_type, int must_succeed)
#endif
file = fdopen (fd, "w+");
- tty->name = xstrdup (name);
- terminal->name = xstrdup (name);
tty->input = file;
tty->output = file;
}