Mercurial > emacs
comparison src/window.c @ 109793:b60dcdd855f0
Merge from mainline.
| author | Katsumi Yamaoka <yamaoka@jpl.org> |
|---|---|
| date | Sun, 08 Aug 2010 22:52:25 +0000 |
| parents | d349244d7b08 |
| children | 08d10ad776d8 |
comparison
equal
deleted
inserted
replaced
| 109649:1f8f03cfcd2b | 109793:b60dcdd855f0 |
|---|---|
| 48 #include "msdos.h" | 48 #include "msdos.h" |
| 49 #endif | 49 #endif |
| 50 #ifdef HAVE_NS | 50 #ifdef HAVE_NS |
| 51 #include "nsterm.h" | 51 #include "nsterm.h" |
| 52 #endif | 52 #endif |
| 53 | |
| 54 | 53 |
| 55 Lisp_Object Qwindowp, Qwindow_live_p, Qwindow_configuration_p; | 54 Lisp_Object Qwindowp, Qwindow_live_p, Qwindow_configuration_p; |
| 56 Lisp_Object Qdisplay_buffer; | 55 Lisp_Object Qdisplay_buffer; |
| 57 Lisp_Object Qscroll_up, Qscroll_down, Qscroll_command; | 56 Lisp_Object Qscroll_up, Qscroll_down, Qscroll_command; |
| 58 Lisp_Object Qwindow_size_fixed; | 57 Lisp_Object Qwindow_size_fixed; |