]> code.delx.au - gnu-emacs/blobdiff - lisp/electric.el
Merge from origin/emacs-24
[gnu-emacs] / lisp / electric.el
index 4bf5963e17517208a9b9cba8164f7f9cdf6810cb..fa9666d8560fa349c5b89c5b4e102218af6b9f29 100644 (file)
       ;; Don't shrink the window, but expand it if necessary.
       (goto-char (point-min))
       (unless (= (point-max) (window-end win t))
-       (fit-window-to-buffer win max-height))
+       ;; This call is executed even if the window existed before, was
+       ;; reused, ... contradicting a claim in the comment before this
+       ;; function.
+       (fit-window-to-buffer win max-height nil nil nil t))
       win)))
 
 ;;; Electric keys.