aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Rudalics2013-12-16 10:58:44 +0100
committerMartin Rudalics2013-12-16 10:58:44 +0100
commitd144ef069cf0b05c528ad9725ca0c06763be6d5b (patch)
treed8702c77dfd0d2f40061a274329cddd0b49a9baf
parenta8bbe29833f12e560a74e397fb1226aa4ea3c78d (diff)
downloademacs-d144ef069cf0b05c528ad9725ca0c06763be6d5b.tar.gz
emacs-d144ef069cf0b05c528ad9725ca0c06763be6d5b.zip
Fix recent w32_enable_frame_resize_hack and display-buffer-below-selected fixes.
* w32term.c (w32_enable_frame_resize_hack): Default to 1. * window.el (display-buffer-below-selected): Bind split-height-threshold to 0 as suggested by Juri Linkov.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/window.el3
-rw-r--r--src/ChangeLog4
-rw-r--r--src/w32term.c2
4 files changed, 12 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fd27eaacc2d..5876dc37fbf 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12013-12-16 Martin Rudalics <rudalics@gmx.at>
2
3 * window.el (display-buffer-below-selected): Bind
4 split-height-threshold to 0 as suggested by Juri Linkov.
5
12013-12-16 Leo Liu <sdl.web@gmail.com> 62013-12-16 Leo Liu <sdl.web@gmail.com>
2 7
3 * progmodes/compile.el (compile-goto-error): Do not push-mark. 8 * progmodes/compile.el (compile-goto-error): Do not push-mark.
diff --git a/lisp/window.el b/lisp/window.el
index 5ba2f8ac2b9..c6238ff3516 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -6245,7 +6245,8 @@ This either splits the selected window or reuses the window below
6245the selected one." 6245the selected one."
6246 (let (window) 6246 (let (window)
6247 (or (and (not (frame-parameter nil 'unsplittable)) 6247 (or (and (not (frame-parameter nil 'unsplittable))
6248 (let (split-width-threshold) 6248 (let ((split-height-threshold 0)
6249 split-width-threshold)
6249 (setq window (window--try-to-split-window (selected-window) alist))) 6250 (setq window (window--try-to-split-window (selected-window) alist)))
6250 (window--display-buffer 6251 (window--display-buffer
6251 buffer window 'window alist display-buffer-mark-dedicated)) 6252 buffer window 'window alist display-buffer-mark-dedicated))
diff --git a/src/ChangeLog b/src/ChangeLog
index 7b8a624d629..dbd2298985b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12013-12-16 Martin Rudalics <rudalics@gmx.at>
2
3 * w32term.c (w32_enable_frame_resize_hack): Default to 1.
4
12013-12-16 Dmitry Antipov <dmantipov@yandex.ru> 52013-12-16 Dmitry Antipov <dmantipov@yandex.ru>
2 6
3 * font.c (valid_font_driver) [ENABLE_CHECKING]: New function 7 * font.c (valid_font_driver) [ENABLE_CHECKING]: New function
diff --git a/src/w32term.c b/src/w32term.c
index e3cdc1d0838..0a8dbb39f7b 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -6679,7 +6679,7 @@ to the Windows API and changing the pixel sizes of the frame and its
6679windows after the latter calls back. If this is non-nil, Emacs changes 6679windows after the latter calls back. If this is non-nil, Emacs changes
6680the pixel sizes of the frame and its windows at the time it sends the 6680the pixel sizes of the frame and its windows at the time it sends the
6681resize request to the API. */); 6681resize request to the API. */);
6682 w32_enable_frame_resize_hack = 0; 6682 w32_enable_frame_resize_hack = 1;
6683 6683
6684 /* Tell Emacs about this window system. */ 6684 /* Tell Emacs about this window system. */
6685 Fprovide (Qw32, Qnil); 6685 Fprovide (Qw32, Qnil);