diff options
| -rw-r--r-- | lisp/ChangeLog | 8 | ||||
| -rw-r--r-- | lisp/calc/calc-ext.el | 2 | ||||
| -rw-r--r-- | lisp/calc/calc-graph.el | 2 | ||||
| -rw-r--r-- | lisp/calc/calc-misc.el | 4 | ||||
| -rw-r--r-- | lisp/calc/calc.el | 2 | ||||
| -rw-r--r-- | lisp/calendar/calendar.el | 4 | ||||
| -rw-r--r-- | lisp/emerge.el | 7 | ||||
| -rw-r--r-- | lisp/mh-e/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/mh-e/mh-show.el | 8 |
9 files changed, 27 insertions, 14 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index fc5cd4c9ee2..086a82bd3f0 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -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. diff --git a/lisp/calc/calc-ext.el b/lisp/calc/calc-ext.el index d97cd7971ea..55204b045cc 100644 --- a/lisp/calc/calc-ext.el +++ b/lisp/calc/calc-ext.el @@ -1343,7 +1343,7 @@ calc-kill calc-kill-region calc-yank)))) ;; 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) diff --git a/lisp/calc/calc-graph.el b/lisp/calc/calc-graph.el index c2ca50ac6f7..cb029d52509 100644 --- a/lisp/calc/calc-graph.el +++ b/lisp/calc/calc-graph.el @@ -1388,7 +1388,7 @@ This \"dumb\" driver will be present in Gnuplot 3.0." (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 diff --git a/lisp/calc/calc-misc.el b/lisp/calc/calc-misc.el index 7e89fecad83..33ceec48e90 100644 --- a/lisp/calc/calc-misc.el +++ b/lisp/calc/calc-misc.el @@ -140,8 +140,8 @@ Calc user interface as before (either C-x * C or C-x * K; initially C-x * C). (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))) diff --git a/lisp/calc/calc.el b/lisp/calc/calc.el index 75a08d7e79b..2fcb0599ead 100644 --- a/lisp/calc/calc.el +++ b/lisp/calc/calc.el @@ -1496,7 +1496,7 @@ commands given here will actually operate on the *Calculator* stack." ;; 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))) diff --git a/lisp/calendar/calendar.el b/lisp/calendar/calendar.el index 90e0acc2eec..c22c29ae1b5 100644 --- a/lisp/calendar/calendar.el +++ b/lisp/calendar/calendar.el @@ -1320,9 +1320,9 @@ display the generated calendar." ;; 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)) diff --git a/lisp/emerge.el b/lisp/emerge.el index 21921e352c6..ee19351a2e3 100644 --- a/lisp/emerge.el +++ b/lisp/emerge.el @@ -3103,10 +3103,9 @@ SPC, it is ignored; if it is anything else, it is processed as a command." (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)) diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog index 585cc0a86c6..3102f74f506 100644 --- a/lisp/mh-e/ChangeLog +++ b/lisp/mh-e/ChangeLog @@ -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 diff --git a/lisp/mh-e/mh-show.el b/lisp/mh-e/mh-show.el index 70852f0bb05..ba972fc5b62 100644 --- a/lisp/mh-e/mh-show.el +++ b/lisp/mh-e/mh-show.el @@ -148,9 +148,11 @@ displayed." (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)... |