diff options
| author | Joakim Verona | 2015-01-16 22:29:10 +0100 |
|---|---|---|
| committer | Joakim Verona | 2015-01-16 22:29:10 +0100 |
| commit | 5e2255017323c54feeaaee220175d7761a3b6ed1 (patch) | |
| tree | 3f843af60b826b63e12482301ce20745a95ede3e /src/window.c | |
| parent | b64675500decba1c707bc5d5c6d57f633934778f (diff) | |
| parent | 78e6ccc4a5006272b14f352e459a6d3bf52ed07b (diff) | |
| download | emacs-5e2255017323c54feeaaee220175d7761a3b6ed1.tar.gz emacs-5e2255017323c54feeaaee220175d7761a3b6ed1.zip | |
merge master
Diffstat (limited to 'src/window.c')
| -rw-r--r-- | src/window.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/window.c b/src/window.c index 60ba3750f5b..d14a0f74fa0 100644 --- a/src/window.c +++ b/src/window.c | |||
| @@ -3645,7 +3645,16 @@ temp_output_buffer_show (register Lisp_Object buf) | |||
| 3645 | } | 3645 | } |
| 3646 | } | 3646 | } |
| 3647 | } | 3647 | } |
| 3648 | 3648 | ||
| 3649 | /* Allocate basically initialized window. */ | ||
| 3650 | |||
| 3651 | static struct window * | ||
| 3652 | allocate_window (void) | ||
| 3653 | { | ||
| 3654 | return ALLOCATE_ZEROED_PSEUDOVECTOR | ||
| 3655 | (struct window, current_matrix, PVEC_WINDOW); | ||
| 3656 | } | ||
| 3657 | |||
| 3649 | /* Make new window, have it replace WINDOW in window-tree, and make | 3658 | /* Make new window, have it replace WINDOW in window-tree, and make |
| 3650 | WINDOW its only vertical child (HORFLAG 1 means make WINDOW its only | 3659 | WINDOW its only vertical child (HORFLAG 1 means make WINDOW its only |
| 3651 | horizontal child). */ | 3660 | horizontal child). */ |