Mercurial > emacs
changeset 93324:41f9d37301a2
(server_accept_connection): Simplify naming.
(emacs_get_tty_pgrp): Use SDATA.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Thu, 27 Mar 2008 20:52:24 +0000 |
| parents | 06e93ffa2e9f |
| children | 38e4e1858d46 |
| files | src/ChangeLog src/process.c |
| diffstat | 2 files changed, 6 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Thu Mar 27 20:26:59 2008 +0000 +++ b/src/ChangeLog Thu Mar 27 20:52:24 2008 +0000 @@ -1,5 +1,8 @@ 2008-03-27 Stefan Monnier <monnier@iro.umontreal.ca> + * process.c (server_accept_connection): Simplify naming. + (emacs_get_tty_pgrp): Use SDATA. + * coding.c (decode_coding_object): Fix last change. 2008-03-27 Jason Rumney <jasonr@gnu.org>
--- a/src/process.c Thu Mar 27 20:26:59 2008 +0000 +++ b/src/process.c Thu Mar 27 20:52:24 2008 +0000 @@ -4055,7 +4055,7 @@ #endif default: caller = Fnumber_to_string (make_number (connect_counter)); - caller = concat3 (build_string (" <*"), caller, build_string ("*>")); + caller = concat3 (build_string (" <"), caller, build_string (">")); break; } @@ -5709,7 +5709,7 @@ int fd; /* Some OS:es (Solaris 8/9) does not allow TIOCGPGRP from the master side. Try the slave side. */ - fd = emacs_open (XSTRING (p->tty_name)->data, O_RDONLY, 0); + fd = emacs_open (SDATA (p->tty_name), O_RDONLY, 0); if (fd != -1) { @@ -5892,7 +5892,7 @@ you'd better be using one of the alternatives above! */ #endif /* ! defined (TCGETA) */ #endif /* ! defined (TIOCGLTC) && defined (TIOCGETC) */ - /* In this case, the code above should alway returns. */ + /* In this case, the code above should alway return. */ abort (); #endif /* ! defined HAVE_TERMIOS */