aboutsummaryrefslogtreecommitdiffhomepage
path: root/generic
diff options
context:
space:
mode:
authorGravatar Pierre Courtieu <courtieu@lri.fr>2012-09-05 23:01:53 +0000
committerGravatar Pierre Courtieu <courtieu@lri.fr>2012-09-05 23:01:53 +0000
commitff9ffa9425bbd50240605a3790b19c368c10fedf (patch)
tree849e4d331dd0d70590c3f7cfe164b54073d5d29d /generic
parent444388352f09a850aa128b606de0bc5d6c2852ba (diff)
Fixed double hit terminator. Now it is disabled by default, and
enabling it disables electric-terminator and vice-versa. In case both are non nil at the same time, then electric teminator has priority. If people like it we may propose this to other modes than coq. + fixed window layout policy.
Diffstat (limited to 'generic')
-rw-r--r--generic/pg-response.el2
-rw-r--r--generic/proof-utils.el14
2 files changed, 2 insertions, 14 deletions
diff --git a/generic/pg-response.el b/generic/pg-response.el
index 561436b0..40ed9ae8 100644
--- a/generic/pg-response.el
+++ b/generic/pg-response.el
@@ -121,7 +121,7 @@ Following POLICY, which can be one of 'smart, 'horizontal, 'vertical."
(split-window-horizontally)
(other-window 1)
(switch-to-buffer b2))
- ((eq policy 'vertically)
+ ((eq policy 'vertical)
(split-window-vertically)
(other-window 1)
(switch-to-buffer b2))
diff --git a/generic/proof-utils.el b/generic/proof-utils.el
index 54dae790..f559eead 100644
--- a/generic/proof-utils.el
+++ b/generic/proof-utils.el
@@ -253,19 +253,7 @@ NB: may change the selected window."
;; switch other window
(set-window-buffer (next-window nil 'ignoreminibuf) buffer)))
;; o/w: call display buffer to configure windows nicely.
- ;; PC: Experimental this was simply (display-buffer buffer) but I am
- ;; experimenting the following policy: when in three windows
- ;; mode, always make new windo on the right pane, that is:
- ;; always split one of the associated buffers windows
- ;; this is not perfect, let's see if people like it
- (let ((associated-windows (proof-associated-windows)))
- (if (not (and proof-three-window-enable associated-windows))
- (display-buffer buffer)
- (select-window (car associated-windows)) ; take on assoc. win
- (proof-safe-split-window-vertically)
- (set-window-dedicated-p (selected-window) nil)
- (switch-to-buffer buffer)
- (set-window-dedicated-p (selected-window) t)))))
+ (display-buffer buffer)))
;; Return the window, hopefully the one we first thought of.
(get-buffer-window buffer 0))