merge master + move changelog and news to readme

3 files changed, 12 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index d45b4e332c6..936564183bb 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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.
diff --git a/src/frame.c b/src/frame.c
index e4adfe8f08f..890e8972617 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -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 *);
diff --git a/src/frame.h b/src/frame.h
index cb0044cfe23..0c08d12c92e 100644
--- a/src/frame.h
+++ b/src/frame.h
@@ -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);