aboutsummaryrefslogtreecommitdiffstats
path: root/src/lisp.h
diff options
context:
space:
mode:
authorTom Tromey2013-08-25 14:25:59 -0600
committerTom Tromey2013-08-25 14:25:59 -0600
commit793ea5055aea85ff9227e1bf0c84ab37edba7201 (patch)
treec9799eebe2b797a55fcbfcbd3710c9b5aa70051d /src/lisp.h
parent1ce4c6398ea453a66f6943552b0ec866a690e9b1 (diff)
parente687aa335a21662f67d2d73063272504a171ffab (diff)
downloademacs-793ea5055aea85ff9227e1bf0c84ab37edba7201.tar.gz
emacs-793ea5055aea85ff9227e1bf0c84ab37edba7201.zip
merge from trunk
Diffstat (limited to 'src/lisp.h')
-rw-r--r--src/lisp.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/lisp.h b/src/lisp.h
index 60a553cc7d1..51c09e0abb3 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -4177,7 +4177,6 @@ extern void init_sys_modes (struct tty_display_info *);
4177extern void reset_sys_modes (struct tty_display_info *); 4177extern void reset_sys_modes (struct tty_display_info *);
4178extern void init_all_sys_modes (void); 4178extern void init_all_sys_modes (void);
4179extern void reset_all_sys_modes (void); 4179extern void reset_all_sys_modes (void);
4180extern void flush_pending_output (int) ATTRIBUTE_CONST;
4181extern void child_setup_tty (int); 4180extern void child_setup_tty (int);
4182extern void setup_pty (int); 4181extern void setup_pty (int);
4183extern int set_window_size (int, int, int); 4182extern int set_window_size (int, int, int);