diff options
| author | Chong Yidong | 2011-04-13 14:19:23 -0400 |
|---|---|---|
| committer | Chong Yidong | 2011-04-13 14:19:23 -0400 |
| commit | c17819f4cd58df1a0a17593152e32fee70cc90f7 (patch) | |
| tree | fc4332f7238c07792ee7804a8f2d4c2f179ebbd9 | |
| parent | 7ee6a1d37268f1f4b7047fc6ccad271d2ee5fd31 (diff) | |
| download | emacs-c17819f4cd58df1a0a17593152e32fee70cc90f7.tar.gz emacs-c17819f4cd58df1a0a17593152e32fee70cc90f7.zip | |
* xdisp.c (init_xdisp): Initialize echo_area_window (Bug#6451).
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/xdisp.c | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index f82494f8a04..cfa9426c882 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2011-04-13 Chong Yidong <cyd@stupidchicken.com> | ||
| 2 | |||
| 3 | * xdisp.c (init_xdisp): Initialize echo_area_window (Bug#6451). | ||
| 4 | |||
| 1 | 2011-04-10 Samuel Thibault <sthibault@debian.org> (tiny change) | 5 | 2011-04-10 Samuel Thibault <sthibault@debian.org> (tiny change) |
| 2 | 6 | ||
| 3 | * sysdep.c (wait_for_termination): On GNU Hurd, kill returns -1 on | 7 | * sysdep.c (wait_for_termination): On GNU Hurd, kill returns -1 on |
diff --git a/src/xdisp.c b/src/xdisp.c index ade95cf3d62..c42410b9f9f 100644 --- a/src/xdisp.c +++ b/src/xdisp.c | |||
| @@ -25139,6 +25139,7 @@ init_xdisp () | |||
| 25139 | 25139 | ||
| 25140 | mini_w = XWINDOW (minibuf_window); | 25140 | mini_w = XWINDOW (minibuf_window); |
| 25141 | root_window = FRAME_ROOT_WINDOW (XFRAME (WINDOW_FRAME (mini_w))); | 25141 | root_window = FRAME_ROOT_WINDOW (XFRAME (WINDOW_FRAME (mini_w))); |
| 25142 | echo_area_window = minibuf_window; | ||
| 25142 | 25143 | ||
| 25143 | if (!noninteractive) | 25144 | if (!noninteractive) |
| 25144 | { | 25145 | { |