Mercurial > emacs
changeset 36317:34ffe86aeeae
(frame-notice-user-settings): Only adjust frame height
for no tool-bar case if tool-bar was originally switched on.
| author | Jason Rumney <jasonr@gnu.org> |
|---|---|
| date | Fri, 23 Feb 2001 10:20:27 +0000 |
| parents | d79558eaaecb |
| children | 130c11089c1d |
| files | lisp/frame.el |
| diffstat | 1 files changed, 5 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/frame.el Fri Feb 23 10:19:58 2001 +0000 +++ b/lisp/frame.el Fri Feb 23 10:20:27 2001 +0000 @@ -292,11 +292,12 @@ (when (display-graphic-p) (let ((tool-bar-lines (or (assq 'tool-bar-lines initial-frame-alist) (assq 'tool-bar-lines default-frame-alist)))) - (when (or (null tool-bar-lines) - (null (cdr tool-bar-lines)) - (eq 0 (cdr tool-bar-lines))) + (when (and tool-bar-originally-present + (or (null tool-bar-lines) + (null (cdr tool-bar-lines)) + (eq 0 (cdr tool-bar-lines)))) (let* ((char-height (frame-char-height frame-initial-frame)) - (image-height 24) + (image-height tool-bar-images-pixel-height) (margin (cond ((and (consp tool-bar-button-margin) (integerp (cdr tool-bar-button-margin)) (> tool-bar-button-margin 0))