diff options
| author | Joakim Verona | 2015-01-11 18:40:21 +0100 |
|---|---|---|
| committer | Joakim Verona | 2015-01-11 18:40:21 +0100 |
| commit | cc7cb20d6abc0f862e5513b24831bba0eaecaa5f (patch) | |
| tree | afc2fc05401504aa0c28699dc3bc155c5b0d7f58 /src/terminal.c | |
| parent | d972b504f30ff4300ba368940751e8736dddf0b4 (diff) | |
| parent | 9a57bda31569294ecaf8138a06e5edda9c0d87e3 (diff) | |
| download | emacs-cc7cb20d6abc0f862e5513b24831bba0eaecaa5f.tar.gz emacs-cc7cb20d6abc0f862e5513b24831bba0eaecaa5f.zip | |
merge master, fix conflicts
Diffstat (limited to 'src/terminal.c')
| -rw-r--r-- | src/terminal.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/terminal.c b/src/terminal.c index 65b68955dbf..92befd28543 100644 --- a/src/terminal.c +++ b/src/terminal.c | |||
| @@ -37,10 +37,6 @@ static int next_terminal_id; | |||
| 37 | /* The initial terminal device, created by initial_term_init. */ | 37 | /* The initial terminal device, created by initial_term_init. */ |
| 38 | struct terminal *initial_terminal; | 38 | struct terminal *initial_terminal; |
| 39 | 39 | ||
| 40 | Lisp_Object Qrun_hook_with_args; | ||
| 41 | static Lisp_Object Qterminal_live_p; | ||
| 42 | static Lisp_Object Qdelete_terminal_functions; | ||
| 43 | |||
| 44 | static void delete_initial_terminal (struct terminal *); | 40 | static void delete_initial_terminal (struct terminal *); |
| 45 | 41 | ||
| 46 | /* This setter is used only in this file, so it can be private. */ | 42 | /* This setter is used only in this file, so it can be private. */ |