diff options
| author | Tom Tromey | 2012-09-04 10:10:06 -0600 |
|---|---|---|
| committer | Tom Tromey | 2012-09-04 10:10:06 -0600 |
| commit | bf69f522a9e135f9aa483cedd53e71e915f2bf75 (patch) | |
| tree | 3f73c47fb863ef87f420de1d30858da821072bd9 /src/window.h | |
| parent | 303324a9232dbc89369faceb6b3530740d0fc1bd (diff) | |
| parent | 6ec9a5a7b5efb129807f567709ca858211ed7840 (diff) | |
| download | emacs-bf69f522a9e135f9aa483cedd53e71e915f2bf75.tar.gz emacs-bf69f522a9e135f9aa483cedd53e71e915f2bf75.zip | |
merge from trunk
Diffstat (limited to 'src/window.h')
| -rw-r--r-- | src/window.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/window.h b/src/window.h index 28b9678b667..dfb88b2cf3c 100644 --- a/src/window.h +++ b/src/window.h | |||
| @@ -972,7 +972,6 @@ struct glyph *get_phys_cursor_glyph (struct window *w); | |||
| 972 | extern Lisp_Object Qwindowp, Qwindow_live_p; | 972 | extern Lisp_Object Qwindowp, Qwindow_live_p; |
| 973 | extern Lisp_Object Vwindow_list; | 973 | extern Lisp_Object Vwindow_list; |
| 974 | 974 | ||
| 975 | extern struct window *decode_valid_window (Lisp_Object); | ||
| 976 | extern struct window *decode_live_window (Lisp_Object); | 975 | extern struct window *decode_live_window (Lisp_Object); |
| 977 | extern int compare_window_configurations (Lisp_Object, Lisp_Object, int); | 976 | extern int compare_window_configurations (Lisp_Object, Lisp_Object, int); |
| 978 | extern void mark_window_cursors_off (struct window *); | 977 | extern void mark_window_cursors_off (struct window *); |