[Emacs-diffs] emacs/lisp ChangeLog emerge.el calc/calc-ext.el...

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       09/10/06 02:42:33

Modified files:
        lisp           : ChangeLog emerge.el 
        lisp/calc      : calc-ext.el calc-graph.el calc-misc.el calc.el 
        lisp/calendar  : calendar.el 
        lisp/mh-e      : ChangeLog mh-show.el 

Log message:
        Use window-full-height-p.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16369&r2=1.16370
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/emerge.el?cvsroot=emacs&r1=1.61&r2=1.62
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/calc/calc-ext.el?cvsroot=emacs&r1=1.79&r2=1.80
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/calc/calc-graph.el?cvsroot=emacs&r1=1.33&r2=1.34
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/calc/calc-misc.el?cvsroot=emacs&r1=1.39&r2=1.40
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/calc/calc.el?cvsroot=emacs&r1=1.133&r2=1.134
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/calendar/calendar.el?cvsroot=emacs&r1=1.287&r2=1.288
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/mh-e/ChangeLog?cvsroot=emacs&r1=1.303&r2=1.304
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/mh-e/mh-show.el?cvsroot=emacs&r1=1.19&r2=1.20

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16369
retrieving revision 1.16370
diff -u -b -r1.16369 -r1.16370
--- ChangeLog   6 Oct 2009 02:37:22 -0000       1.16369
+++ ChangeLog   6 Oct 2009 02:42:29 -0000       1.16370
@@ -1,5 +1,13 @@
 2009-10-06  Glenn Morris  <address@hidden>
 
+       * 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.

Index: emerge.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/emerge.el,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -b -r1.61 -r1.62
--- emerge.el   2 Oct 2009 03:48:40 -0000       1.61
+++ emerge.el   6 Oct 2009 02:42:32 -0000       1.62
@@ -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)))
+                       (not (window-full-height-p)))
+             (enlarge-window 1))
            (let* ((echo-keystrokes 0)
                   (c (read-event)))
              (if (not (eq c 32))

Index: calc/calc-ext.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/calc/calc-ext.el,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -b -r1.79 -r1.80
--- calc/calc-ext.el    9 Jan 2009 03:57:14 -0000       1.79
+++ calc/calc-ext.el    6 Oct 2009 02:42:32 -0000       1.80
@@ -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)

Index: calc/calc-graph.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/calc/calc-graph.el,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- calc/calc-graph.el  19 Sep 2009 21:22:48 -0000      1.33
+++ calc/calc-graph.el  6 Oct 2009 02:42:32 -0000       1.34
@@ -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

Index: calc/calc-misc.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/calc/calc-misc.el,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- calc/calc-misc.el   29 Jul 2009 03:42:19 -0000      1.39
+++ calc/calc-misc.el   6 Oct 2009 02:42:32 -0000       1.40
@@ -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)))

Index: calc/calc.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/calc/calc.el,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -b -r1.133 -r1.134
--- calc/calc.el        1 Oct 2009 02:17:41 -0000       1.133
+++ calc/calc.el        6 Oct 2009 02:42:32 -0000       1.134
@@ -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)))

Index: calendar/calendar.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/calendar/calendar.el,v
retrieving revision 1.287
retrieving revision 1.288
diff -u -b -r1.287 -r1.288
--- calendar/calendar.el        5 Oct 2009 05:36:15 -0000       1.287
+++ calendar/calendar.el        6 Oct 2009 02:42:32 -0000       1.288
@@ -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))

Index: mh-e/ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/mh-e/ChangeLog,v
retrieving revision 1.303
retrieving revision 1.304
diff -u -b -r1.303 -r1.304
--- mh-e/ChangeLog      28 Aug 2009 04:21:18 -0000      1.303
+++ mh-e/ChangeLog      6 Oct 2009 02:42:33 -0000       1.304
@@ -1,3 +1,7 @@
+2009-10-06  Glenn Morris  <address@hidden>
+
+       * mh-show.el (mh-show-msg): Use window-full-height-p.
+
 2009-08-28  Stefan Monnier  <address@hidden>
 
        * mh-comp.el (mh-send-letter): default-buffer-file-coding-system

Index: mh-e/mh-show.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/mh-e/mh-show.el,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- mh-e/mh-show.el     28 Aug 2009 17:02:54 -0000      1.19
+++ mh-e/mh-show.el     6 Oct 2009 02:42:33 -0000       1.20
@@ -148,7 +148,9 @@
             (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
+    (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)