diff options
| author | Kenichi Handa | 2012-08-28 22:44:20 +0900 |
|---|---|---|
| committer | Kenichi Handa | 2012-08-28 22:44:20 +0900 |
| commit | 4eb4de01df384be9b8d811f7ab476eeb37ece748 (patch) | |
| tree | d04f0dae31dd8b533a0c3cd738430841ce7ebb84 /src/window.h | |
| parent | fabc1281e9cde34ff9a19d843316d2ceca8647ad (diff) | |
| parent | 4f2daf31078e2cc059710e129dffe0beed8fc7c2 (diff) | |
| download | emacs-4eb4de01df384be9b8d811f7ab476eeb37ece748.tar.gz emacs-4eb4de01df384be9b8d811f7ab476eeb37ece748.zip | |
merge 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 *); |