Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-16 17:24:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

(Electric-pop-up-window): Use fit-window-to-buffer

Browse source 
instead of calculating the right size.
This commit is contained in:
Richard M. Stallman 2005-01-02 23:11:26 +00:00
parent 303b041210
commit c45c149c37
2 changed files with 9 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lisp/ChangeLog
View file

@ -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,

20
lisp/electric.el
View file

@ -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)))