aboutsummaryrefslogtreecommitdiffstats
path: root/src/lisp.h
diff options
context:
space:
mode:
authorPaul Eggert2011-05-02 22:47:50 -0700
committerPaul Eggert2011-05-02 22:47:50 -0700
commitaceeea6c4510002d8fe99b2e6727532ba9cdd8ea (patch)
tree2be9fe4b48ca3ba75c93160c03c22889d80b1cad /src/lisp.h
parent79f5556a7a75ed21c4fafa04f02adb81822a57f9 (diff)
parent256661260dfed952d6497aef73607bfe24795614 (diff)
downloademacs-aceeea6c4510002d8fe99b2e6727532ba9cdd8ea.tar.gz
emacs-aceeea6c4510002d8fe99b2e6727532ba9cdd8ea.zip
Merge from mainline.
Diffstat (limited to 'src/lisp.h')
-rw-r--r--src/lisp.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/lisp.h b/src/lisp.h
index 76938a49ac4..bb3a8cc393c 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -3349,6 +3349,7 @@ extern void reset_sys_modes (struct tty_display_info *);
3349extern void init_all_sys_modes (void); 3349extern void init_all_sys_modes (void);
3350extern void reset_all_sys_modes (void); 3350extern void reset_all_sys_modes (void);
3351extern void wait_for_termination (int); 3351extern void wait_for_termination (int);
3352extern void interruptible_wait_for_termination (int);
3352extern void flush_pending_output (int); 3353extern void flush_pending_output (int);
3353extern void child_setup_tty (int); 3354extern void child_setup_tty (int);
3354extern void setup_pty (int); 3355extern void setup_pty (int);