diff options
| author | Glenn Morris | 2011-04-22 20:07:16 -0700 |
|---|---|---|
| committer | Glenn Morris | 2011-04-22 20:07:16 -0700 |
| commit | 4ffd0d6b569d252e4e807d4e9c9d6a5bd5b08640 (patch) | |
| tree | 26c20c7c4da56fae7e041c9345c76cce1224188c /src/xdisp.c | |
| parent | 81de9236e1daa1fe7dfd0ef9aaaf1e13b6aa74e4 (diff) | |
| parent | be71f8100a71a5b896ef05c32f51a09a3d9e3993 (diff) | |
| download | emacs-4ffd0d6b569d252e4e807d4e9c9d6a5bd5b08640.tar.gz emacs-4ffd0d6b569d252e4e807d4e9c9d6a5bd5b08640.zip | |
Merge from emacs-23; up to 2010-06-09T17:54:28Z!albinus@detlef.
Diffstat (limited to 'src/xdisp.c')
| -rw-r--r-- | src/xdisp.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/xdisp.c b/src/xdisp.c index 574c84fc086..19fef35fce8 100644 --- a/src/xdisp.c +++ b/src/xdisp.c | |||
| @@ -26997,6 +26997,7 @@ init_xdisp (void) | |||
| 26997 | 26997 | ||
| 26998 | mini_w = XWINDOW (minibuf_window); | 26998 | mini_w = XWINDOW (minibuf_window); |
| 26999 | root_window = FRAME_ROOT_WINDOW (XFRAME (WINDOW_FRAME (mini_w))); | 26999 | root_window = FRAME_ROOT_WINDOW (XFRAME (WINDOW_FRAME (mini_w))); |
| 27000 | echo_area_window = minibuf_window; | ||
| 27000 | 27001 | ||
| 27001 | if (!noninteractive) | 27002 | if (!noninteractive) |
| 27002 | { | 27003 | { |