From c45c149c3727ebd50f84a4c7cb06ec6be4ed5199 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Sun, 2 Jan 2005 23:11:26 +0000 Subject: [PATCH] (Electric-pop-up-window): Use fit-window-to-buffer instead of calculating the right size. --- lisp/ChangeLog | 6 ++++++ lisp/electric.el | 20 +++----------------- 2 files changed, 9 insertions(+), 17 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 4eebddf0dc0..4501a5db72c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2005-01-02 Richard M. Stallman + + * electric.el (Electric-pop-up-window): Use fit-window-to-buffer + instead of calculating the right size. + 2005-01-02 Stefan * vc-arch.el (vc-arch-workfile-version): Handle the empty-branch case. @@ -49,6 +54,7 @@ * ses.el (copy-region-as-kill): Deactivate mark. +>>>>>>> 1.6818 2005-01-01 Richard M. Stallman * replace.el (occur-1): If the output buffer is also an input, diff --git a/lisp/electric.el b/lisp/electric.el index 3d2bf140c8c..18a4d8388c5 100644 --- a/lisp/electric.el +++ b/lisp/electric.el @@ -144,31 +144,17 @@ (buf (get-buffer buffer)) (one-window (one-window-p t)) (pop-up-windows t) - (pop-up-frames nil) - (target-height) - (lines)) + (pop-up-frames nil)) (if (not buf) (error "Buffer %s does not exist" buffer) - (with-current-buffer buf - (setq lines (count-lines (point-min) (point-max))) - (setq target-height - (min (max (if max-height (min max-height (1+ lines)) (1+ lines)) - window-min-height) - (save-window-excursion - (delete-other-windows) - (1- (window-height (selected-window))))))) (cond ((and (eq (window-buffer win) buf)) (select-window win)) (one-window (pop-to-buffer buffer) - (setq win (selected-window)) - (enlarge-window (- target-height (window-height win)))) + (setq win (selected-window))) (t (switch-to-buffer buf))) - (if (and (not max-height) - (> target-height (window-height (selected-window)))) - (progn (goto-char (window-start win)) - (enlarge-window (- target-height (window-height win))))) + (fit-window-to-buffer win max-height) (goto-char (point-min)) win))) -- 2.39.5