Merge changes from emacs-23 branch

[bpt/emacs.git] / src / ChangeLog

diff --git a/src/ChangeLog b/src/ChangeLog
index 9b4a709..879ecc9 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,91 @@
+2011-01-02  Eli Zaretskii  <eliz@gnu.org>
+
+       * keyboard.c (Vselect_active_regions): Doc fix.  (Bug#7702)
+
+2011-01-02  Eli Zaretskii  <eliz@gnu.org>
+
+       * image.c <Qlibpng_version>: New variable.
+       (syms_of_image): Intern and staticpro it.  Set its value to the
+       version of PNG library we were compiled with.
+       (my_png_error, png_load): Avoid GCC warnings about direct access
+       to png_ptr->jmpbuf.  (Bug#7716)
+       (png_jmpbuf): New macro.
+       (my_png_error, png_load): Use it instead of #ifdef'ing according
+       to PNG_LIBPNG_VER_MAJOR and PNG_LIBPNG_VER_MINOR.
+
+2011-01-02  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * .gdbinit (xgetptr): Fix the union+lsb case.
+       (xbacktrace): Fix the union case.
+
+2011-01-02  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * window.c (Fmove_to_window_line): Avoid abort when called in a buffer
+       different from selected-window's.
+
+2011-01-02  Eli Zaretskii  <eliz@gnu.org>
+
+       * keyboard.c (parse_menu_item): Prepend "  " to the key sequence
+       equivalent of a menu item when the key sequence is given by the
+       `:keys' attribute.  (Bug#7662)
+
+       * xdisp.c (Fformat_mode_line): Doc fix: no need to state that only
+       the basic faces are supported.
+
+2011-01-02  Jan Djärv  <jan.h.d@swipnet.se>
+
+       * xterm.c (x_check_fullscreen): Fix pixel/character mixup.
+
+2011-01-02  Eli Zaretskii  <eliz@gnu.org>
+
+       * xdisp.c (Fformat_mode_line): Fix last change.
+
+2011-01-02  Chong Yidong  <cyd@stupidchicken.com>
+
+       * xdisp.c (Fformat_mode_line): Restrict the FACE argument to basic
+       faces (Bug#7587).
+
+2011-01-02  Eli Zaretskii  <eliz@gnu.org>
+
+       * fileio.c (Fexpand_file_name): One more doc fix.
+
+2011-01-01  Chong Yidong  <cyd@stupidchicken.com>
+
+       * gtkutil.c (xg_get_tool_bar_widgets): Use NULL for a missing
+       image or label in the container.
+       (xg_make_tool_item): Replace VERT_ONLY arg with HORIZ, TEXT_IMAGE.
+       (xg_show_toolbar_item): Function deleted.
+       (xg_tool_item_stale_p): New function.
+       (update_frame_tool_bar): Calculate tool-bar style once per call.
+       Instead of hiding text labels, omit them.  Don't use
+       xg_show_toolbar_item; create new GtkToolItems from scratch if
+       necessary, instead of trying to re-use them.  This avoids an
+       annoying animation when changing tool-bars.
+
+2010-12-31  Jan Djärv  <jan.h.d@swipnet.se>
+
+       * nsfns.m (ns_set_name_as_filename): Always use buffer name for
+       title and buffer filename only for RepresentedFilename.
+       Handle bad UTF-8 in buffer name (Bug#7517).
+
+2010-12-30  Jan Djärv  <jan.h.d@swipnet.se>
+
+       * coding.h (ENCODE_UTF_8): Remove "Used by ..." comment.
+
+       * nsfns.m (ns_set_name_iconic): Remove.
+       (ns_set_name_internal): New function (Bug#7517).
+       (Vicon_title_format): Extern declare.
+       (ns_set_name): Call ns_set_name_internal.
+       (x_explicitly_set_name): Remove call to ns_set_name_iconic.
+       (x_implicitly_set_name): Ditto.
+       (x_set_title): Remove commet about EXPLICIT.  Call ns_set_name_internal.
+       (ns_set_name_as_filename): Encode name with ENCODE_UTF_8 (Bug#7517).
+
+2010-12-29  Štěpán Němec  <stepnem@gmail.com>  (tiny change)
+
+       * window.c (syms_of_window): Add missing defsubr for
+       window-use-time.
+
 2010-12-28  Andreas Schwab  <schwab@linux-m68k.org>
 
        * xterm.h (x_alloc_lighter_color_for_widget): Restore declaration.