procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Omit unnecessary var if GTK or NS

Browse source 
* frame.c, frame.h (frame_default_tool_bar_height) [USE_GTK||HAVE_NS]:
Now a constant zero on these platforms.
This commit is contained in:
Paul Eggert 2015-02-02 16:20:55 -08:00
parent c10828bd85
commit 1905cb7637
3 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/ChangeLog
View file

@ -1,3 +1,9 @@
2015-02-03 Paul Eggert <eggert@cs.ucla.edu>
Omit unnecessary var if GTK or NS
* frame.c, frame.h (frame_default_tool_bar_height) [USE_GTK||HAVE_NS]:
Now a constant zero on these platforms.
2015-02-01 Martin Rudalics <rudalics@gmx.at>
* xdisp.c (Fwindow_text_pixel_size): Add optional argument BUFFER.

4
src/frame.c
View file

@ -68,7 +68,11 @@ static struct frame *last_nonminibuf_frame;
bool frame_garbaged;
/* The default tool bar height for future frames. */
#if defined USE_GTK || defined HAVE_NS
enum { frame_default_tool_bar_height = 0 };
#else
int frame_default_tool_bar_height;
#endif
#ifdef HAVE_WINDOW_SYSTEM
static void x_report_frame_params (struct frame *, Lisp_Object *);

2
src/frame.h
View file

@ -1100,7 +1100,9 @@ SET_FRAME_VISIBLE (struct frame *f, int v)
extern Lisp_Object selected_frame;
#if ! (defined USE_GTK || defined HAVE_NS)
extern int frame_default_tool_bar_height;
#endif
extern struct frame *decode_window_system_frame (Lisp_Object);
extern struct frame *decode_live_frame (Lisp_Object);