mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-17 10:06:13 +00:00
Code Issues Releases Activity

(Ftool_bar_lines_needed): New function.

Browse Source 
(syms_of_xdisp): Defsubr it.
This commit is contained in:
Gerd Moellmann 2001-01-22 15:17:50 +00:00
parent 57760935c1
commit 57c28064ec
2 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/ChangeLog
View File

@ -1,5 +1,8 @@
2001-01-22 Gerd Moellmann <gerd@gnu.org>
* xdisp.c (Ftool_bar_lines_needed): New function.
(syms_of_xdisp): Defsubr it.
* editfns.c (Fformat): Don't extend text properties from arguments
to padding chars in the result.

33
src/xdisp.c
View File

@ -7411,6 +7411,38 @@ tool_bar_lines_needed (f)
}
DEFUN ("tool-bar-lines-needed", Ftool_bar_lines_needed, Stool_bar_lines_needed,
0, 1, 0,
"Return the number of lines occupied by the tool bar of FRAME.")
(frame)
Lisp_Object frame;
{
struct frame *f;
struct window *w;
int nlines = 0;
if (NILP (frame))
frame = selected_frame;
else
CHECK_FRAME (frame, 0);
f = XFRAME (frame);
if (WINDOWP (f->tool_bar_window)
|| (w = XWINDOW (f->tool_bar_window),
XFASTINT (w->height) > 0))
{
update_tool_bar (f, 1);
if (f->n_tool_bar_items)
{
build_desired_tool_bar_string (f);
nlines = tool_bar_lines_needed (f);
}
}
return make_number (nlines);
}
/* Display the tool-bar of frame F. Value is non-zero if tool-bar's
height should be changed. */
@ -13929,6 +13961,7 @@ syms_of_xdisp ()
defsubr (&Strace_redisplay_toggle);
defsubr (&Strace_to_stderr);
#endif
defsubr (&Stool_bar_lines_needed);
staticpro (&Qmenu_bar_update_hook);
Qmenu_bar_update_hook = intern ("menu-bar-update-hook");