From 50fcb507ff60cad600bcaa814230fecc5ef2646f Mon Sep 17 00:00:00 2001 From: Pierre Courtieu Date: Tue, 25 Sep 2012 09:44:18 +0000 Subject: Fixed a bug in three windows mode. --- generic/pg-response.el | 5 +++-- generic/proof-useropts.el | 7 ++++--- 2 files changed, 7 insertions(+), 5 deletions(-) (limited to 'generic') diff --git a/generic/pg-response.el b/generic/pg-response.el index e5ecfb47..970c09ec 100644 --- a/generic/pg-response.el +++ b/generic/pg-response.el @@ -143,8 +143,9 @@ Following POLICY, which can be one of 'smart, 'horizontal, (other-window 1) (switch-to-buffer b3)) ((eq pol 'horizontal) - (display-buffer b2) ; horizontally, should be large enough + (split-window-horizontally) ; horizontally again (other-window 1) + (switch-to-buffer b2) (enlarge-window (/ (frame-width) 6) t) ; take 2/3 of width before splitting again (split-window-horizontally) ; horizontally again (other-window 1) @@ -197,7 +198,7 @@ dragging the separating bars. - horizontal: 3 columns mode, one for each buffer (script, goals, response). - By default, the display mode is automatically chosen + By default, the display mode is automatically chosen by considering the current emacs frame width: if it is smaller than `split-width-threshold' then vertical mode is chosen, otherwise if it is smaller than 1.5 * `split-width-threshold' diff --git a/generic/proof-useropts.el b/generic/proof-useropts.el index d023a67e..664ee640 100644 --- a/generic/proof-useropts.el +++ b/generic/proof-useropts.el @@ -189,9 +189,10 @@ and displayed lazily. See `proof-layout-windows'." See `proof-layout-windows'." :type '(choice - (const :tag "Horizontally if frame wide enough" smart) - (const :tag "Horizontally" horizontal) - (const :tag "Vertically" vertical)) + (const :tag "Adapt to current frame width" smart) + (const :tag "Horizontal (three columns)" horizontal) + (const :tag "Horizontal (two columns)" hybrid) + (const :tag "Vertical" vertical)) :group 'proof-user-options) -- cgit v1.2.3