diff options
| author | Eli Zaretskii | 2009-08-14 09:17:11 +0000 |
|---|---|---|
| committer | Eli Zaretskii | 2009-08-14 09:17:11 +0000 |
| commit | 8b9fc636617be134583554739009aba26e97cbd8 (patch) | |
| tree | 3db45e03420ac882745c041f6ce1d512fa57396b /src | |
| parent | 86a0ed4c65e8335e26cc1b5380cecd3c36710adc (diff) | |
| download | emacs-8b9fc636617be134583554739009aba26e97cbd8.tar.gz emacs-8b9fc636617be134583554739009aba26e97cbd8.zip | |
(create_pty): Fix last change.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/process.c | 7 |
2 files changed, 10 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index fb194ed5e27..5e78a64a0ba 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2009-08-14 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * process.c (create_pty): Fix last change. | ||
| 4 | |||
| 1 | 2009-08-13 Chong Yidong <cyd@stupidchicken.com> | 5 | 2009-08-13 Chong Yidong <cyd@stupidchicken.com> |
| 2 | 6 | ||
| 3 | * image.c (xbm_read_bitmap_data): New arg inhibit_image_error. | 7 | * image.c (xbm_read_bitmap_data): New arg inhibit_image_error. |
diff --git a/src/process.c b/src/process.c index 15ed971b3e2..56a8d189f99 100644 --- a/src/process.c +++ b/src/process.c | |||
| @@ -2355,7 +2355,12 @@ create_pty (process) | |||
| 2355 | max_process_desc = inchannel; | 2355 | max_process_desc = inchannel; |
| 2356 | 2356 | ||
| 2357 | XPROCESS (process)->pid = -2; | 2357 | XPROCESS (process)->pid = -2; |
| 2358 | XPROCESS (process)->tty_name = build_string (pty_name); | 2358 | #ifdef HAVE_PTYS |
| 2359 | if (pty_flag) | ||
| 2360 | XPROCESS (process)->tty_name = build_string (pty_name); | ||
| 2361 | else | ||
| 2362 | #endif | ||
| 2363 | XPROCESS (process)->tty_name = Qnil; | ||
| 2359 | } | 2364 | } |
| 2360 | 2365 | ||
| 2361 | 2366 | ||