diff options
| author | K. Handa | 2015-01-07 22:51:41 +0900 |
|---|---|---|
| committer | K. Handa | 2015-01-07 22:51:41 +0900 |
| commit | 88bc8332eb14bcc4780fd3fe3dd4de2205c31dbf (patch) | |
| tree | 18da116400703b67738bdbbd38cc4abf4c1e929f /src/xterm.h | |
| parent | 3f79d3131629f73da16ec121d2a0056f11b70e65 (diff) | |
| parent | 95295df44cc2b6e0e2442aeff96b0fe2ceac405c (diff) | |
| download | emacs-88bc8332eb14bcc4780fd3fe3dd4de2205c31dbf.tar.gz emacs-88bc8332eb14bcc4780fd3fe3dd4de2205c31dbf.zip | |
Merge branch master of git.sv.gnu.org:/srv/git/emacs.
Diffstat (limited to 'src/xterm.h')
| -rw-r--r-- | src/xterm.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/xterm.h b/src/xterm.h index 13877d33935..f2aff72e3ac 100644 --- a/src/xterm.h +++ b/src/xterm.h | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* Definitions and headers for communication with X protocol. | 1 | /* Definitions and headers for communication with X protocol. |
| 2 | Copyright (C) 1989, 1993-1994, 1998-2014 Free Software Foundation, | 2 | Copyright (C) 1989, 1993-1994, 1998-2015 Free Software Foundation, |
| 3 | Inc. | 3 | Inc. |
| 4 | 4 | ||
| 5 | This file is part of GNU Emacs. | 5 | This file is part of GNU Emacs. |
| @@ -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 | ||