From: Kenichi Handa Date: Wed, 29 Jan 2014 13:39:00 +0000 (+0900) Subject: merge trunk X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~241 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=908df335d0ccb2779f23c695f355a9939fe07bf2;p=emacs.git merge trunk --- 908df335d0ccb2779f23c695f355a9939fe07bf2 diff --cc src/ChangeLog index aa3a65ccb60,93711966775..04f5f0d6bbe --- a/src/ChangeLog +++ b/src/ChangeLog @@@ -1,16 -1,36 +1,49 @@@ +2014-01-27 K. Handa + + 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 + + * w32fns.c (x_set_tool_bar_lines): Don't clear area on frames + that are not visible. + + 2014-01-29 Jan Djärv + + * xmenu.c (create_and_show_popup_menu): Handle case when no key + is grabbed (Bug#16565). + + 2014-01-28 Martin Rudalics + + * 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 + + * 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 + . + * xfaces.c (free_frame_faces): Adjust comment. + + 2014-01-26 Paul Eggert + + * data.c (Fstring_to_number): Document results if unparsable + (Bug#16551). + 2014-01-26 Jan Djärv * xterm.c (x_focus_changed): Check for non-X terminal-frame (Bug#16540)