diff options
| author | Dmitry Antipov <dmantipov@yandex.ru> | 2014-07-21 20:58:12 +0400 |
|---|---|---|
| committer | Dmitry Antipov <dmantipov@yandex.ru> | 2014-07-21 20:58:12 +0400 |
| commit | 780c294f37fc0132aeab5d7ee6ecf4152ebb7215 (patch) | |
| tree | af9fec0faf00bf0bad0e7bd44f0c827223a080a2 | |
| parent | 190644a0115a592f237b5f7c91f0f96e82edb864 (diff) | |
| download | emacs-780c294f37fc0132aeab5d7ee6ecf4152ebb7215.tar.gz | |
* src/frame.c (Fframe_parameters): Always report frame height without
menu and tool bar lines.
* etc/TODO: remove frame height remark.
| -rw-r--r-- | etc/ChangeLog | 4 | ||||
| -rw-r--r-- | etc/TODO | 5 | ||||
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/frame.c | 2 |
4 files changed, 10 insertions, 6 deletions
diff --git a/etc/ChangeLog b/etc/ChangeLog index 8ae48c277a8..fdaf1f0cabd 100644 --- a/etc/ChangeLog +++ b/etc/ChangeLog @@ -1,3 +1,7 @@ +2014-07-21 Dmitry Antipov <dmantipov@yandex.ru> + + * TODO: remove frame height remark. + 2014-07-11 Michael Albinus <michael.albinus@gmx.de> * NEWS: Passwords in batch mode are hidden. @@ -144,11 +144,6 @@ for users to customize. http://lists.gnu.org/archive/html/emacs-pretest-bug/2005-12/msg00165.html, and the rest of that discussion. -** Height returned by frame-parameter ... and height given to - make-frame does not mean the same thing. The former includes menu and - tool bar lines, the latter don't. frame-parameter should return height - without menu and tool bar lines. - ** In Emacs Info, examples of using Customize should be clickable and they should create Custom buffers. diff --git a/src/ChangeLog b/src/ChangeLog index 25732ac9f5d..30a02475262 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2014-07-21 Dmitry Antipov <dmantipov@yandex.ru> + + * frame.c (Fframe_parameters): Always report frame height without + menu and tool bar lines. + 2014-07-21 Jan Djärv <jan.h.d@swipnet.se> * nsterm.m (applicationDidFinishLaunching:): Call diff --git a/src/frame.c b/src/frame.c index 8d6f3567334..731a62705bd 100644 --- a/src/frame.c +++ b/src/frame.c @@ -2240,7 +2240,7 @@ If FRAME is omitted or nil, return information on the currently selected frame. ? (f->new_pixelwise ? (f->new_height / FRAME_LINE_HEIGHT (f)) : f->new_height) - : FRAME_LINES (f)); + : FRAME_LINES (f)) - FRAME_TOP_MARGIN (f); store_in_alist (&alist, Qheight, make_number (height)); width = (f->new_width ? (f->new_pixelwise |