From: Nick Roberts <nickrob@snap.net.nz>
Date: Wed, 1 Mar 2006 22:59:06 +0000 (+0000)
Subject: (dframe-frame-mode): Don't burp when menu-bar-lines is nil.
X-Git-Tag: emacs-pretest-22.0.90~3824
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d7dbc017b4c3a13a8750681050a900dd42296b79;p=emacs.git

(dframe-frame-mode): Don't burp when menu-bar-lines is nil.
---

diff --git a/lisp/dframe.el b/lisp/dframe.el
index e238a469dd5..f77a5059026 100644
--- a/lisp/dframe.el
+++ b/lisp/dframe.el
@@ -422,7 +422,7 @@ CREATE-HOOK are hooks to run after creating a frame."
 			    parameters
 			  (append
 			   parameters
-			   (list (cons 'height (+ mh (frame-height)))))))
+			   (list (cons 'height (+ (or mh 0) (frame-height)))))))
 		       (params
 			;; Only add a guessed width if one is not specified
 			;; in the input parameters.