diff options
| author | Paul Eggert | 2012-05-25 11:19:24 -0700 |
|---|---|---|
| committer | Paul Eggert | 2012-05-25 11:19:24 -0700 |
| commit | 42b2a986d9d4b7040fb20c90ec0efeffb78e761a (patch) | |
| tree | d38e7bf5307837f2f38982757f088100de18a64e /src/xterm.h | |
| parent | e4d81efc58695c19154d5f6733d91172b4c3e5b7 (diff) | |
| parent | a8d3cbf75d219d7a249fc0623219511179e959da (diff) | |
| download | emacs-42b2a986d9d4b7040fb20c90ec0efeffb78e761a.tar.gz emacs-42b2a986d9d4b7040fb20c90ec0efeffb78e761a.zip | |
Merge from trunk.
Diffstat (limited to 'src/xterm.h')
| -rw-r--r-- | src/xterm.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/xterm.h b/src/xterm.h index b498261a805..8919b648371 100644 --- a/src/xterm.h +++ b/src/xterm.h | |||
| @@ -1031,6 +1031,7 @@ extern void x_clipboard_manager_save_all (void); | |||
| 1031 | 1031 | ||
| 1032 | extern struct x_display_info * check_x_display_info (Lisp_Object); | 1032 | extern struct x_display_info * check_x_display_info (Lisp_Object); |
| 1033 | extern Lisp_Object x_get_focus_frame (struct frame *); | 1033 | extern Lisp_Object x_get_focus_frame (struct frame *); |
| 1034 | extern int x_in_use; | ||
| 1034 | 1035 | ||
| 1035 | #ifdef USE_GTK | 1036 | #ifdef USE_GTK |
| 1036 | extern int xg_set_icon (struct frame *, Lisp_Object); | 1037 | extern int xg_set_icon (struct frame *, Lisp_Object); |