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/xterm.h | |
| parent | d972b504f30ff4300ba368940751e8736dddf0b4 (diff) | |
| parent | 9a57bda31569294ecaf8138a06e5edda9c0d87e3 (diff) | |
| download | emacs-cc7cb20d6abc0f862e5513b24831bba0eaecaa5f.tar.gz emacs-cc7cb20d6abc0f862e5513b24831bba0eaecaa5f.zip | |
merge master, fix conflicts
Diffstat (limited to 'src/xterm.h')
| -rw-r--r-- | src/xterm.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/xterm.h b/src/xterm.h index 25ce67b55d0..f2aff72e3ac 100644 --- a/src/xterm.h +++ b/src/xterm.h | |||
| @@ -1111,9 +1111,6 @@ extern bool x_session_have_connection (void); | |||
| 1111 | extern void x_session_close (void); | 1111 | extern void x_session_close (void); |
| 1112 | #endif | 1112 | #endif |
| 1113 | 1113 | ||
| 1114 | /* Defined in xterm.c */ | ||
| 1115 | |||
| 1116 | extern Lisp_Object Qx_gtk_map_stock; | ||
| 1117 | 1114 | ||
| 1118 | /* Is the frame embedded into another application? */ | 1115 | /* Is the frame embedded into another application? */ |
| 1119 | 1116 | ||