diff options
| author | Jason Rumney | 2007-10-09 11:24:40 +0000 |
|---|---|---|
| committer | Jason Rumney | 2007-10-09 11:24:40 +0000 |
| commit | f8d1a163bdcfd347243a772321698f76b39eee8c (patch) | |
| tree | 9be1c4bc51235467ead61dc10bf3f25c7bea96d4 /src | |
| parent | 4b70e299ef66906fd285198003c72a1439d1f252 (diff) | |
| download | emacs-f8d1a163bdcfd347243a772321698f76b39eee8c.tar.gz emacs-f8d1a163bdcfd347243a772321698f76b39eee8c.zip | |
(x_set_window_size): Disable code that attempts to tell
Lisp code about a size change before it actually happens.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/w32term.c | 18 |
2 files changed, 22 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 1a535bc7872..1220112b8b7 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2007-10-09 Jason Rumney <jasonr@gnu.org> | ||
| 2 | |||
| 3 | * w32term.c (x_set_window_size): Disable code that attempts to tell | ||
| 4 | Lisp code about a size change before it actually happens. | ||
| 5 | |||
| 1 | 2007-10-09 Richard Stallman <rms@gnu.org> | 6 | 2007-10-09 Richard Stallman <rms@gnu.org> |
| 2 | 7 | ||
| 3 | * xdisp.c (handle_invisible_prop): After setting up an ellipsis, | 8 | * xdisp.c (handle_invisible_prop): After setting up an ellipsis, |
diff --git a/src/w32term.c b/src/w32term.c index f3d13b826e1..510f2381a6d 100644 --- a/src/w32term.c +++ b/src/w32term.c | |||
| @@ -5521,7 +5521,22 @@ x_set_window_size (f, change_gravity, cols, rows) | |||
| 5521 | SWP_NOZORDER | SWP_NOMOVE | SWP_NOACTIVATE); | 5521 | SWP_NOZORDER | SWP_NOMOVE | SWP_NOACTIVATE); |
| 5522 | } | 5522 | } |
| 5523 | 5523 | ||
| 5524 | /* Now, strictly speaking, we can't be sure that this is accurate, | 5524 | #if 0 |
| 5525 | /* The following mirrors what is done in xterm.c. It appears to be | ||
| 5526 | for informing lisp of the new size immediately, while the actual | ||
| 5527 | resize will happen asynchronously. But on Windows, the menu bar | ||
| 5528 | automatically wraps when the frame is too narrow to contain it, | ||
| 5529 | and that causes any calculations made here to come out wrong. The | ||
| 5530 | end is some nasty buggy behaviour, including the potential loss | ||
| 5531 | of the minibuffer. | ||
| 5532 | |||
| 5533 | Disabling this code is either not sufficient to fix the problems | ||
| 5534 | completely, or it causes fresh problems, but at least it removes | ||
| 5535 | the most problematic symptom of the minibuffer becoming unusable. | ||
| 5536 | |||
| 5537 | ----------------------------------------------------------------- | ||
| 5538 | |||
| 5539 | Now, strictly speaking, we can't be sure that this is accurate, | ||
| 5525 | but the window manager will get around to dealing with the size | 5540 | but the window manager will get around to dealing with the size |
| 5526 | change request eventually, and we'll hear how it went when the | 5541 | change request eventually, and we'll hear how it went when the |
| 5527 | ConfigureNotify event gets here. | 5542 | ConfigureNotify event gets here. |
| @@ -5552,6 +5567,7 @@ x_set_window_size (f, change_gravity, cols, rows) | |||
| 5552 | Actually checking whether it is outside is a pain in the neck, | 5567 | Actually checking whether it is outside is a pain in the neck, |
| 5553 | so don't try--just let the highlighting be done afresh with new size. */ | 5568 | so don't try--just let the highlighting be done afresh with new size. */ |
| 5554 | cancel_mouse_face (f); | 5569 | cancel_mouse_face (f); |
| 5570 | #endif | ||
| 5555 | 5571 | ||
| 5556 | UNBLOCK_INPUT; | 5572 | UNBLOCK_INPUT; |
| 5557 | } | 5573 | } |