summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/electric.el20
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 <rms@gnu.org>
+
+ * electric.el (Electric-pop-up-window): Use fit-window-to-buffer
+ instead of calculating the right size.
+
2005-01-02 Stefan <monnier@iro.umontreal.ca>
* 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 <rms@gnu.org>
* 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)))