(mh-show-msg): Likewise.

(mh-handle-process-error): Use frame-width instead of obsolete
screen-width.

diff --git a/lisp/mail/mh-utils.el b/lisp/mail/mh-utils.el
index 9e079656c40fedf0d6f00e6effb0bac0d877c18f..12a078ea9b04cbd964225c5df4c0b71aa63d471c 100644 (file)
--- a/lisp/mail/mh-utils.el
+++ b/lisp/mail/mh-utils.el
@@ -301,7 +301,7 @@ Type \"\\[mh-header-display]\" to see the message with all its headers."
            (if (not clean-message-header)
                (mh-start-of-uncleaned-message)))
        (mh-display-msg msg folder))))
-  (if (not (= (1+ (window-height)) (screen-height))) ;not horizontally split
+  (if (not (= (1+ (window-height)) (frame-height))) ;not horizontally split
       (shrink-window (- (window-height) mh-summary-height)))
   (mh-recenter nil)
   (if (not (memq msg mh-seen-list)) (setq mh-seen-list (cons msg mh-seen-list)))
@@ -970,7 +970,7 @@ directory names."
          (t
           ;; will error message fit on one line?
           (goto-line 2)
-          (if (and (< (buffer-size) (screen-width))
+          (if (and (< (buffer-size) (frame-width))
                    (eobp))
               (error "%s"
                      (buffer-substring 1 (progn (goto-char 1)