diff options
| author | Joakim Verona | 2015-01-11 18:40:21 +0100 |
|---|---|---|
| committer | Joakim Verona | 2015-01-11 18:40:21 +0100 |
| commit | cc7cb20d6abc0f862e5513b24831bba0eaecaa5f (patch) | |
| tree | afc2fc05401504aa0c28699dc3bc155c5b0d7f58 /src/window.h | |
| parent | d972b504f30ff4300ba368940751e8736dddf0b4 (diff) | |
| parent | 9a57bda31569294ecaf8138a06e5edda9c0d87e3 (diff) | |
| download | emacs-cc7cb20d6abc0f862e5513b24831bba0eaecaa5f.tar.gz emacs-cc7cb20d6abc0f862e5513b24831bba0eaecaa5f.zip | |
merge master, fix conflicts
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 2ed0f3e9fbc..2ec28ab4e56 100644 --- a/src/window.h +++ b/src/window.h | |||
| @@ -1085,7 +1085,6 @@ struct glyph *get_phys_cursor_glyph (struct window *w); | |||
| 1085 | CHECK_TYPE (WINDOW_LIVE_P (WINDOW), Qwindow_live_p, WINDOW) | 1085 | CHECK_TYPE (WINDOW_LIVE_P (WINDOW), Qwindow_live_p, WINDOW) |
| 1086 | 1086 | ||
| 1087 | /* These used to be in lisp.h. */ | 1087 | /* These used to be in lisp.h. */ |
| 1088 | extern Lisp_Object Qwindow_live_p; | ||
| 1089 | extern Lisp_Object Vwindow_list; | 1088 | extern Lisp_Object Vwindow_list; |
| 1090 | 1089 | ||
| 1091 | extern Lisp_Object window_list (void); | 1090 | extern Lisp_Object window_list (void); |