Merge from trunk.

1 files changed, 157 insertions, 3 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index c27b4c69bb5..79bcf192eb7 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,4 +1,4 @@
-2012-01-17  Paul Eggert  <eggert@cs.ucla.edu>
+2012-02-10  Paul Eggert  <eggert@cs.ucla.edu>
 
         Fix integer width and related bugs (Bug#9874).
         * alloc.c (pure_bytes_used_lisp, pure_bytes_used_non_lisp):
@@ -788,6 +788,160 @@
         rather than rolling our own approximation.
         (SCROLL_BAR_VEC_SIZE): Remove; not used.
 
+2012-02-10  Glenn Morris  <rgm@gnu.org>
+
+        * fns.c (Fsecure_hash): Doc fix.
+
+2012-02-09  Kenichi Handa  <handa@m17n.org>
+
+        * coding.c (produce_chars): Fix updating of src_end (Bug#10701).
+
+2012-02-07  Chong Yidong  <cyd@gnu.org>
+
+        * buffer.c (Fbuffer_local_variables)
+        (buffer_lisp_local_variables): Handle unbound vars correctly;
+        don't let Qunbound leak into Lisp.
+
+2012-02-07  Glenn Morris  <rgm@gnu.org>
+
+        * image.c (Fimagemagick_types): Doc fix.
+
+        * image.c (imagemagick-render-type): Change it from a lisp object
+        to an integer.  Move the doc here from the lisp manual.
+        Treat all values not equal to 0 the same.
+
+2012-02-06  Chong Yidong  <cyd@gnu.org>
+
+        * doc.c (store_function_docstring): Avoid applying docstring of
+        alias to base function (Bug#2603).
+
+2012-02-04  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * .gdbinit (pp1, pv1): Remove redundant defines.
+        (pr): Use pp.
+
+2012-02-04  Chong Yidong  <cyd@gnu.org>
+
+        * nsterm.m: Declare a global (Bug#10694).
+
+2012-02-04  Eli Zaretskii  <eliz@gnu.org>
+
+        * w32.c (get_emacs_configuration_options): Include
+        --enable-checking, if specified, in the return value.
+
+2012-02-04  Martin Rudalics  <rudalics@gmx.at>
+
+        * dispnew.c (change_frame_size_1): Calculate new_frame_total_cols
+        after rounding frame sizes.  (Bug#9723)
+
+2012-02-04  Eli Zaretskii  <eliz@gnu.org>
+
+        * keyboard.c (adjust_point_for_property): Don't position point
+        before BEGV.  (Bug#10696)
+
+2012-02-03  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Handle overflow when computing char display width (Bug#9496).
+        * character.c (char_width): Return EMACS_INT, not int.
+        (char_width, c_string_width): Check for overflow when
+        computing the width; this is possible now that individual
+        characters can have unbounded width.  Problem introduced
+        by merge from Emacs 23 on 2012-01-19.
+
+2012-02-02  Michael Albinus  <michael.albinus@gmx.de>
+
+        * dbusbind.c (Fdbus_register_method): Mention the return value
+        :ignore in the docstring.
+
+2012-02-02  Glenn Morris  <rgm@gnu.org>
+
+        * callproc.c (Fcall_process, Fcall_process_region): Doc fix.
+
+        * nsterm.m (syms_of_nsterm) <x-toolkit-scroll-bars>:
+        Unconditionally set to t.  (Bug#10673)
+        * nsterm.m (syms_of_nsterm) <x-toolkit-scroll-bars>:
+        * w32term.c (syms_of_w32term) <x-toolkit-scroll-bars>:
+        * xterm.c (syms_of_xterm) <x-toolkit-scroll-bars>: Doc fix.
+
+2012-02-02  Kenichi Handa  <handa@m17n.org>
+
+        (x_produce_glyphs): Cancel previous change.  If cmp->glyph_len is
+        0, do not call append_composite_glyph.
+
+2012-02-02  Kenichi Handa  <handa@m17n.org>
+
+        * xdisp.c (BUILD_COMPOSITE_GLYPH_STRING): Initialize first_s to
+        NULL (Bug#6988).
+        (x_produce_glyphs): If the component of a composition is a null
+        string, set it->pixel_width to 1 to avoid zero-width glyph.
+
+2012-02-01  Eli Zaretskii  <eliz@gnu.org>
+
+        * ralloc.c (resize_bloc, r_alloc_sbrk): Don't call memmove if its
+        first 2 arguments are identical.  This makes inserting large
+        output from a subprocess an order of magnitude faster on
+        MS-Windows, where all sbrk'ed memory is always contiguous.
+
+2012-01-31  Glenn Morris  <rgm@gnu.org>
+
+        * nsterm.m (syms_of_nsterm) <x-toolkit-scroll-bars>:
+        * w32term.c (syms_of_w32term) <x-toolkit-scroll-bars>:
+        * xterm.c (syms_of_xterm) <x-toolkit-scroll-bars>: Sync docs.
+
+2012-01-29  Glenn Morris  <rgm@gnu.org>
+
+        * gnutls.c (syms_of_gnutls): More doc (from etc/NEWS).
+
+2012-01-28  Samuel Thibault  <sthibault@debian.org>  (tiny change)
+
+        * s/gnu.h: Define POSIX_SIGNALS (Bug#10552).
+
+2012-01-28  Chong Yidong  <cyd@gnu.org>
+
+        * minibuf.c (syms_of_minibuf): Doc fix (Bug#10550).
+
+2012-01-26  Chong Yidong  <cyd@gnu.org>
+
+        * keyboard.c (Vecho_keystrokes): Document zero value (Bug#10503).
+
+        * search.c (Fsearch_forward, Fsearch_backward): Document negative
+        repeat counts (Bug#10507).
+
+2012-01-26  Glenn Morris  <rgm@gnu.org>
+
+        * lread.c (syms_of_lread): Doc fix.
+
+2012-01-25  HIROSHI OOTA  <nil@mad.dog.cx>  (tiny change)
+
+        * coding.c (encode_designation_at_bol): Change return value to
+        EMACS_INT.
+
+2012-01-25  Chong Yidong  <cyd@gnu.org>
+
+        * eval.c (Fuser_variable_p): Doc fix; mention custom-variable-p.
+
+2012-01-21  Chong Yidong  <cyd@gnu.org>
+
+        * floatfns.c (Fcopysign): Make the second argument non-optional,
+        since nil is not allowed anyway.
+
+2012-01-21  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * process.c (read_process_output): Use p instead of XPROCESS (proc).
+        (send_process): Likewise.
+
+2012-01-19  Martin Rudalics  <rudalics@gmx.at>
+
+        * window.c (save_window_save, Fcurrent_window_configuration)
+        (Vwindow_persistent_parameters): Do not use Qstate.  Rewrite
+        doc-strings.
+
+2012-01-19  Kenichi Handa  <handa@m17n.org>
+
+        * character.c (char_width): New function.
+        (Fchar_width, c_string_width, lisp_string_width):
+        Use char_width (Bug#9496).
+
 2012-01-16  Martin Rudalics  <rudalics@gmx.at>
 
         * window.c (Vwindow_persistent_parameters): New variable.
@@ -3098,7 +3252,7 @@
         Remove unreachable code.
         (read_hex, load_charset_map_from_file): Check for integer overflow.
 
-        * xterm.c: don't go over XClientMessageEvent limit
+        * xterm.c: Don't go over XClientMessageEvent limit.
         (scroll_bar_windows_size): Now ptrdiff_t, as we prefer signed.
         (x_send_scroll_bar_event): Likewise.  Check that the size does not
         exceed limits imposed by XClientMessageEvent, as well as the usual
@@ -6389,7 +6543,7 @@
 
         * ccl.c (ccl_driver): Redo slightly to avoid the need for 'unsigned'.
 
-        ccl: add integer overflow checks
+        ccl: Add integer overflow checks.
         * ccl.c (CCL_CODE_MAX, GET_CCL_RANGE, GET_CCL_CODE, GET_CCL_INT):
         (IN_INT_RANGE): New macros.
         (ccl_driver): Use them to check for integer overflow when