summaryrefslogtreecommitdiff
path: root/src/emacs.c
diff options
context:
space:
mode:
authorDan Nicolaescu <dann@ics.uci.edu>2010-11-14 22:10:35 -0800
committerDan Nicolaescu <dann@ics.uci.edu>2010-11-14 22:10:35 -0800
commit12e610e89e2a3ae9de569e12a57d310102952ce6 (patch)
treeb946605e1027b2a7c76e89cf7aab0abb962721e5 /src/emacs.c
parent92d3ab7e328831b39967bd92ad51c123a66756ce (diff)
downloademacs-12e610e89e2a3ae9de569e12a57d310102952ce6.tar.gz
emacs-12e610e89e2a3ae9de569e12a57d310102952ce6.tar.bz2
emacs-12e610e89e2a3ae9de569e12a57d310102952ce6.zip
Clean up src/systty.h macros.
* systty.h (EMACS_GET_TTY_PGRP, EMACS_SET_TTY_PGRP, EMACS_GET_TTY) (EMACS_SET_TTY): Remove unneeded abstraction, instead inline the definition in all uses. (EMACS_TTY_TABS_OK): Remove, it has a single user. * src/sysdep.c (discard_tty_input, child_setup_tty) (init_sys_modes, tabs_safe_p, reset_sys_modes): * src/emacs.c (shut_down_emacs): * src/callproc.c (child_setup): * src/term.c (dissociate_if_controlling_tty): Inline removed macros.
Diffstat (limited to 'src/emacs.c')
-rw-r--r--src/emacs.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/emacs.c b/src/emacs.c
index 64da350e22c..97ffd1a74c7 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -2053,10 +2053,8 @@ shut_down_emacs (int sig, int no_x, Lisp_Object stuff)
#ifndef DOS_NT
{
int pgrp = EMACS_GETPGRP (0);
-
- int tpgrp;
- if (EMACS_GET_TTY_PGRP (0, &tpgrp) != -1
- && tpgrp == pgrp)
+ int tpgrp = tcgetpgrp (0);
+ if ((tpgrp != -1) && tpgrp == pgrp)
{
reset_all_sys_modes ();
if (sig && sig != SIGTERM)