diff options
| author | Joakim Verona <joakim@verona.se> | 2013-07-14 11:04:49 +0200 |
|---|---|---|
| committer | Joakim Verona <joakim@verona.se> | 2013-07-14 11:04:49 +0200 |
| commit | 0bb9bb0841d89fff09820a57369df4cb01b16b43 (patch) | |
| tree | 832bf9fa8415eef0ce464d22b3ee1300cfa90bb1 /src/termhooks.h | |
| parent | 3718127221fbbc31f8ebd027ab7c95403dbe9118 (diff) | |
| parent | 3af1c8684ed6e48fbc21481d129e9aa164752c6e (diff) | |
| download | emacs-0bb9bb0841d89fff09820a57369df4cb01b16b43.tar.gz emacs-0bb9bb0841d89fff09820a57369df4cb01b16b43.tar.bz2 emacs-0bb9bb0841d89fff09820a57369df4cb01b16b43.zip | |
Merge branch 'trunk' into xwidget
Conflicts:
src/xdisp.c
Diffstat (limited to 'src/termhooks.h')
| -rw-r--r-- | src/termhooks.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/termhooks.h b/src/termhooks.h index fdbeda076b7..f11f5ae9ffc 100644 --- a/src/termhooks.h +++ b/src/termhooks.h @@ -646,7 +646,7 @@ extern struct terminal *terminal_list; (((d)->type != output_termcap && (d)->type != output_msdos_raw) \ || (d)->display_info.tty->input) -extern struct terminal *get_terminal (Lisp_Object terminal, int); +extern struct terminal *get_terminal (Lisp_Object terminal, bool); extern struct terminal *create_terminal (void); extern void delete_terminal (struct terminal *); |