Merge from trunk.

1 files changed, 43 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 25271d6f6b8..89c640bd8c7 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,46 @@
+2013-12-11  Ken Brown  <kbrown@cornell.edu>
+
+        * dispextern.h (erase_phys_cursor):
+        * keyboard.h (make_ctrl_char): Declare prototypes if HAVE_NTGUI.
+
+2013-12-11  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        * nsterm.m (x_free_frame_resources):
+        * term.c (tty_free_frame_resources):
+        * xterm.c (x_free_frame_resources): Do not check for non-NULL
+        face cache because it's implied by free_frame_faces anyway.
+        * w32term.c (x_free_frame_resources): Likewise.  Do not call
+        free_frame_faces twice.
+
+2013-12-11  Rüdiger Sonderfeld  <ruediger@c-plusplus.de>
+
+        * editfns.c (Fformat_time_string): Mention %F in the doc.
+
+2013-12-11  Martin Rudalics  <rudalics@gmx.at>
+
+        * window.c (resize_frame_windows): Don't return immediately when
+        the root window's size doesn't change - the minibuffer window
+        may still have to be repositioned/resized.
+        * xfns.c (Fx_create_frame): Always change the frame size after
+        initializing the frame's faces.
+        * xterm.c (handle_one_xevent): Don't set pixel sizes here,
+        change_frame_size should already have done it.
+        (x_new_font): Assign new tool- and menu-bar heights.
+        (x_set_window_size_1): Account for tool- and menu-bar heights
+        (Bug#16013). Don't set pixel sizes since change_frame_size
+        should already have done it.
+
+2013-12-11  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Remove the option of using libcrypto.
+        * Makefile.in (LIB_CRYPTO): Remove.
+        (LIBES): Don't use it.
+
+2013-12-11  Juri Linkov  <juri@jurta.org>
+
+        * term.c (term_get_fkeys_1): Remove non-standard IBM terminfo
+        as obsolete to avoid conflicts with <S-up>.  (Bug#13471)
+
 2013-12-10  Dmitry Antipov  <dmantipov@yandex.ru>
 
         * xdisp.c (display_tool_bar_line): Don't extend on a previously