Mercurial > emacs
changeset 105478:e3187820f169
Use window-full-height-p.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Tue, 06 Oct 2009 02:42:29 +0000 |
| parents | b9bdbb16b3fa |
| children | 4a9dc19db3b9 |
| files | lisp/ChangeLog lisp/calc/calc-ext.el lisp/calc/calc-graph.el lisp/calc/calc-misc.el lisp/calc/calc.el lisp/calendar/calendar.el lisp/emerge.el lisp/mh-e/ChangeLog lisp/mh-e/mh-show.el |
| diffstat | 9 files changed, 27 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Tue Oct 06 02:37:22 2009 +0000 +++ b/lisp/ChangeLog Tue Oct 06 02:42:29 2009 +0000 @@ -1,5 +1,13 @@ 2009-10-06 Glenn Morris <rgm@gnu.org> + * emerge.el (emerge-show-file-name): + * calc/calc.el (calc-quit): + * calc/calc-misc.el (calc-big-or-small): + * calc/calc-graph.el (calc-graph-view): + * calc/calc-ext.el (calc-reset): + * calendar/calendar.el (calendar-basic-setup): + Use window-full-height-p. + * mail/rmailedit.el (rmail-cease-edit): If there is a Content-Type header we don't understand, don't insert another. (Bug#4624) If changing mime charset, insert the new one in the right place.
--- a/lisp/calc/calc-ext.el Tue Oct 06 02:37:22 2009 +0000 +++ b/lisp/calc/calc-ext.el Tue Oct 06 02:42:29 2009 +0000 @@ -1343,7 +1343,7 @@ ;; take up the whole height of the frame. (if (and win - (< (window-height win) (1- (frame-height)))) + (not (window-full-height-p))) (let ((height (- (window-height win) 2))) (set-window-point win (point)) (or (= height calc-window-height)
--- a/lisp/calc/calc-graph.el Tue Oct 06 02:37:22 2009 +0000 +++ b/lisp/calc/calc-graph.el Tue Oct 06 02:42:29 2009 +0000 @@ -1388,7 +1388,7 @@ (set-window-buffer win buf) (if (eq major-mode 'calc-mode) (if (or need - (< (window-height) (1- (frame-height)))) + (not (window-full-height-p))) (display-buffer buf)) (switch-to-buffer buf))))) (save-excursion
--- a/lisp/calc/calc-misc.el Tue Oct 06 02:37:22 2009 +0000 +++ b/lisp/calc/calc-misc.el Tue Oct 06 02:42:29 2009 +0000 @@ -140,8 +140,8 @@ (if cwin (setq calc-full-mode (if kwin - (and twin (eq (window-width twin) (frame-width))) - (eq (window-height cwin) (1- (frame-height)))))) + (and twin (window-full-width-p twin)) + (window-full-height-p cwin)))) (setq calc-full-mode (if arg (> (prefix-numeric-value arg) 0) (not calc-full-mode)))
--- a/lisp/calc/calc.el Tue Oct 06 02:37:22 2009 +0000 +++ b/lisp/calc/calc.el Tue Oct 06 02:42:29 2009 +0000 @@ -1496,7 +1496,7 @@ ;; next time Calc is called, the window will be the same size ;; as the current window. (if (and win - (< (window-height win) (1- (frame-height))) + (not (window-full-height-p win)) (window-full-width-p win) ; avoid calc-keypad (not (get-buffer-window "*Calc Keypad*"))) (setq calc-window-height (- (window-height win) 2)))
--- a/lisp/calendar/calendar.el Tue Oct 06 02:37:22 2009 +0000 +++ b/lisp/calendar/calendar.el Tue Oct 06 02:42:29 2009 +0000 @@ -1320,9 +1320,9 @@ ;; Is this a wide frame? If so, split it horizontally. (if (window-splittable-p t) (split-window-horizontally)) (pop-to-buffer calendar-buffer) - ;; Has the window already been split vertically? (See bug#4543) + ;; Has the window already been split vertically? (when (and (not (window-dedicated-p)) - (= (window-height) (window-height (frame-root-window)))) + (window-full-height-p)) (let ((win (split-window-vertically))) ;; Show something else in the upper window. (switch-to-buffer (other-buffer))
--- a/lisp/emerge.el Tue Oct 06 02:37:22 2009 +0000 +++ b/lisp/emerge.el Tue Oct 06 02:42:29 2009 +0000 @@ -3103,10 +3103,9 @@ (progn (erase-buffer) (insert name) - (if (not (pos-visible-in-window-p)) - (while (and (not (pos-visible-in-window-p)) - (> (1- (frame-height)) (window-height))) - (enlarge-window 1))) + (while (and (not (pos-visible-in-window-p)) + (not (window-full-height-p))) + (enlarge-window 1)) (let* ((echo-keystrokes 0) (c (read-event))) (if (not (eq c 32))
--- a/lisp/mh-e/ChangeLog Tue Oct 06 02:37:22 2009 +0000 +++ b/lisp/mh-e/ChangeLog Tue Oct 06 02:42:29 2009 +0000 @@ -1,3 +1,7 @@ +2009-10-06 Glenn Morris <rgm@gnu.org> + + * mh-show.el (mh-show-msg): Use window-full-height-p. + 2009-08-28 Stefan Monnier <monnier@iro.umontreal.ca> * mh-comp.el (mh-send-letter): default-buffer-file-coding-system
--- a/lisp/mh-e/mh-show.el Tue Oct 06 02:37:22 2009 +0000 +++ b/lisp/mh-e/mh-show.el Tue Oct 06 02:42:29 2009 +0000 @@ -148,9 +148,11 @@ (if (not clean-message-header) (mh-start-of-uncleaned-message))) (mh-display-msg msg folder))) - (if (not (= (1+ (window-height)) (frame-height))) ;not horizontally split - (shrink-window (- (window-height) (or mh-summary-height - (mh-summary-height))))) + (unless (if (fbound 'window-full-height-p) + (window-full-height-p) + (= (1+ (window-height)) (frame-height))) ; not vertically split + (shrink-window (- (window-height) (or mh-summary-height + (mh-summary-height))))) (mh-recenter nil) ;; The following line is a nop which forces update of the scan line so ;; that font-lock will update it (if needed)...