diff options
| author | Joakim Verona | 2013-07-02 22:46:17 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-07-02 22:46:17 +0200 |
| commit | 3718127221fbbc31f8ebd027ab7c95403dbe9118 (patch) | |
| tree | ef422898f3344c8f94f6ecf63eb583122bbf2bd8 /src/window.h | |
| parent | 1ce45b902c67b8a0dda8d71bd2812de29a9988a6 (diff) | |
| parent | a3b49114c186d84404226af75ae7905bd1cd018f (diff) | |
| download | emacs-3718127221fbbc31f8ebd027ab7c95403dbe9118.tar.gz emacs-3718127221fbbc31f8ebd027ab7c95403dbe9118.zip | |
Merge branch 'trunk' into xwidget
Conflicts:
src/window.c
Diffstat (limited to 'src/window.h')
| -rw-r--r-- | src/window.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/window.h b/src/window.h index 411756f045e..846831e43d5 100644 --- a/src/window.h +++ b/src/window.h | |||
| @@ -958,7 +958,7 @@ struct glyph *get_phys_cursor_glyph (struct window *w); | |||
| 958 | 958 | ||
| 959 | /* These used to be in lisp.h. */ | 959 | /* These used to be in lisp.h. */ |
| 960 | 960 | ||
| 961 | extern Lisp_Object Qwindowp, Qwindow_live_p; | 961 | extern Lisp_Object Qwindow_live_p; |
| 962 | extern Lisp_Object Vwindow_list; | 962 | extern Lisp_Object Vwindow_list; |
| 963 | 963 | ||
| 964 | extern struct window *decode_live_window (Lisp_Object); | 964 | extern struct window *decode_live_window (Lisp_Object); |