diff options
| author | Dan Nicolaescu <dann@ics.uci.edu> | 2008-12-12 00:54:31 +0000 |
|---|---|---|
| committer | Dan Nicolaescu <dann@ics.uci.edu> | 2008-12-12 00:54:31 +0000 |
| commit | 97c6058a7a48f149d88ec2c9ed1c70f5c0449ff5 (patch) | |
| tree | c1f0b30ac31cdb04ea4c30502082fc77310f8dc6 /src | |
| parent | 2cf6bf632ffda40cb6ae59fea1141b2549b587c4 (diff) | |
| download | emacs-97c6058a7a48f149d88ec2c9ed1c70f5c0449ff5.tar.gz emacs-97c6058a7a48f149d88ec2c9ed1c70f5c0449ff5.tar.bz2 emacs-97c6058a7a48f149d88ec2c9ed1c70f5c0449ff5.zip | |
(init_tty): Move setting the terminal name before the
potential user: maybe_fatal.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/term.c | 5 |
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; } |