merge trunk

diff --cc src/ChangeLog
index aa3a65ccb600d913b110e961f83ae4eaa3533d3a,9371196677535dc3d3dd08af4755286631fa7d6c..04f5f0d6bbe8786aa8983c831240f79f6af780c5
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,16 -1,36 +1,49 @@@
 +2014-01-27  K. Handa  <handa@gnu.org>
 +
 +      Fix bug#16286 by the different way than revno:116158 to preserve
 +      the code detection behavior of 24.3.
 +
 +      * coding.h (struct coding_system): New member detected_utf8_bytes.
 +
 +      * coding.c (detect_coding_utf_8): Set coding->detected_utf8_bytes.
 +      (decode_coding_gap): Use short cut for UTF-8 file reading only
 +      when coding->detected_utf8_bytes equals to coding->src_bytes.
 +
 +      * fileio.c (Finsert_file_contents): Cancel the previous change.
 +
+ 2014-01-29  Martin Rudalics  <rudalics@gmx.at>
+ 
+       * w32fns.c (x_set_tool_bar_lines): Don't clear area on frames
+       that are not visible.
+ 
+ 2014-01-29  Jan Djärv  <jan.h.d@swipnet.se>
+ 
+       * xmenu.c (create_and_show_popup_menu): Handle case when no key
+       is grabbed (Bug#16565).
+ 
+ 2014-01-28  Martin Rudalics  <rudalics@gmx.at>
+ 
+       * xdisp.c (last_max_ascent): Re-remove after erroneously
+       reintroducing it on 2013-11-30 and abolishing Dmitry's removal
+       from 2013-03-29.
+       (move_it_to): Re-remove reference to last_max_ascent.
+       (Fwindow_text_pixel_size): Add iterator's max_ascent and
+       max_descent here instead of calling line_bottom_y.  Fix
+       doc-string.
+ 
+ 2014-01-28  Dmitry Antipov  <dmantipov@yandex.ru>
+ 
+       * terminal.c (initial_free_frame_resources): New function.
+       (init_initial_terminal): Install new hook to free face cache
+       on initial frame and avoid memory leak.  For details, see
+       <http://lists.gnu.org/archive/html/emacs-devel/2014-01/msg01974.html>.
+       * xfaces.c (free_frame_faces): Adjust comment.
+ 
+ 2014-01-26  Paul Eggert  <eggert@cs.ucla.edu>
+ 
+       * data.c (Fstring_to_number): Document results if unparsable
+       (Bug#16551).
+ 
  2014-01-26  Jan Djärv  <jan.h.d@swipnet.se>
  
        * xterm.c (x_focus_changed): Check for non-X terminal-frame (Bug#16540)