Merge from mainline.

diff --cc src/ChangeLog
index 93c43b8518432dff594ce4211aa646112fa82e34,54b24c50a1cbb756d725161fe8163497b46a2391..8a20c06b41c2e09584c66d460177108af2521e8e
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,32 -1,17 +1,46 @@@
 +2011-03-27  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +      * keyboard.c, keyboard.h (num_input_events): Now size_t.
 +      This avoids undefined behavior on integer overflow, and is a bit
 +      more convenient anyway since it is compared to a size_t variable.
 +
 +      Variadic C functions now count arguments with size_t, not int.
 +      This avoids an unnecessary limitation on 64-bit machines, which
 +      caused (substring ...) to crash on large vectors (Bug#8344).
 +      * lisp.h (struct Lisp_Subr.function.aMANY): Now takes size_t, not int.
 +      (DEFUN_ARGS_MANY, internal_condition_case_n, safe_call): Likewise.
 +      All variadic functions changed accordingly.
 +      (struct gcpro.nvars): Now size_t, not int.  All uses changed.
 +      * data.c (arith_driver, float_arith_driver): Likewise.
 +      * editfns.c (general_insert_function): Likewise.
 +      * eval.c (struct backtrace.nargs, interactive_p)
 +      (internal_condition_case_n, run_hook_with_args, apply_lambda)
 +      (funcall_lambda, mark_backtrace): Likewise.
 +      * fns.c (concat): Likewise.
 +      * frame.c (x_set_frame_parameters): Likewise.
 +      * fns.c (get_key_arg): Now accepts and returns size_t, and returns
 +      0 if not found, not -1.  All callers changed.
 +
 +2011-03-26  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +      * alloc.c (garbage_collect): Don't assume stack size fits in int.
 +      (stack_copy_size): Now size_t, not int.
 +      (stack_copy, stack_copy_size): Define only if MAX_SAVE_STACK > 0.
 +
+ 2011-03-27  Glenn Morris  <rgm@gnu.org>
+ 
+       * syssignal.h: Replace RETSIGTYPE with void.
+       * atimer.c, data.c, dispnew.c, emacs.c, floatfns.c, keyboard.c:
+       * keyboard.h, lisp.h, process.c, sysdep.c, xterm.c:
+       Replace SIGTYPE with void everywhere.
+       * s/usg5-4-common.h (SIGTYPE): Remove definition.
+       * s/template.h (SIGTYPE): Remove commented out definition.
+ 
+ 2011-03-26  Eli Zaretskii  <eliz@gnu.org>
+ 
+       * xdisp.c (redisplay_window): Don't check buffer's clip_changed
+       flag as a prerequisite for invoking try_scrolling.  (Bug#6671)
+ 
  2011-03-26  Juanma Barranquero  <lekktu@gmail.com>
  
        * w32.c (read_unc_volume): Use parameter `henum', instead of

diff --cc src/data.c
Simple merge

diff --cc src/keyboard.c
Simple merge

diff --cc src/keyboard.h
Simple merge

diff --cc src/lisp.h
Simple merge

diff --cc src/process.c
Simple merge

diff --cc src/xdisp.c
Simple merge