Merge from emacs-24; up to 2012-12-22T19:09:52Z!rgm@gnu.org

diff --cc doc/lispref/ChangeLog
index 355d0b5,722e741..c4f45d0
--- 1/doc/lispref/ChangeLog
--- 2/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@@ -1,15 -1,7 +1,19 @@@
 -2013-02-23  Eli Zaretskii  <eliz@gnu.org>
++2013-02-24  Eli Zaretskii  <eliz@gnu.org>
+ 
+       * files.texi (Magic File Names): Improve wording and indexing.
+ 
 +2013-02-21  Glenn Morris  <rgm@gnu.org>
 +
 +      * display.texi (Multi-Frame Images): Minor rephrasing.
 +
 +2013-02-20  Glenn Morris  <rgm@gnu.org>
 +
 +      * display.texi (GIF Images, TIFF Images): Delete these nodes.
 +      (ImageMagick Images): For :index, use an xref rather than duplicating.
 +      (Other Image Types): Add GIF, adjust formatting.
 +      (Multi-Frame Images): Rename from Animated Images.  Expand section.
 +      * elisp.texi (Top): Update menu for these changes.
 +
  2013-02-19  Glenn Morris  <rgm@gnu.org>
  
        * text.texi (Change Hooks): Fix typo.

diff --cc doc/lispref/files.texi
Simple merge

diff --cc doc/misc/ChangeLog
index 9a4f4c1,63cbcdc..632f06d
--- 1/doc/misc/ChangeLog
--- 2/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@@ -1,3 -1,11 +1,10 @@@
 -      Port documentation to Texinfo 5.0.
 -
+ 2013-02-24  Michael Albinus  <michael.albinus@gmx.de>
+ 
++      Port Tramp documentation to Texinfo 5.0.
+       * tramp.texi (top) [xxx, yyy, trampfn]: Remove superfluous @c.
+       (Filename Syntax): Do not use @trampfn{} in @item.
+       (Filename completion): Use @columnfractions in @multitable.
+ 
  2013-02-22  Glenn Morris  <rgm@gnu.org>
  
        * flymake.texi (Syntax check statuses): Fix multitable continued rows.

diff --cc doc/misc/tramp.texi
Simple merge

diff --cc etc/TODO
Simple merge

diff --cc src/ChangeLog
index cc8cb84,42a2fd0..8d3fc1e
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,50 -1,18 +1,64 @@@
 -2013-02-18  Eli Zaretskii  <eliz@gnu.org>
+ 2013-02-24  Andreas Schwab  <schwab@linux-m68k.org>
+ 
+       * xdisp.c (set_message): Only check for debug-on-message if STRING
+       is a string.  (Bug#13797)
+ 
+ 2013-02-24  Paul Eggert  <eggert@cs.ucla.edu>
+ 
+       Fix regression introduced by July 10 filelock.c patch.
+       * filelock.c (fill_in_lock_file_name): Fix crash caused by the
+       2012-07-10 patch to this file.  Reported by Eli Zaretskii in
+       <http://lists.gnu.org/archive/html/emacs-devel/2013-02/msg00533.html>
+       and diagnosed by Andreas Schwab in
+       <http://lists.gnu.org/archive/html/emacs-devel/2013-02/msg00534.html>.
+ 
 +2013-02-22  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +      Assume C89 or better.
 +      * ralloc.c (SIZE, POINTER, NIL):
 +      * vm-limit.c (POINTER):
 +      Remove, replacing all uses with C89 equivalents.  These old
 +      symbols were present only for porting to pre-C89 platforms.
 +
 +2013-02-22  Claudio Bley  <claudio.bley@gmail.com>
 +
 +      * w32.c (emacs_gnutls_pull): Don't call 'select', and don't loop.
 +      This avoids warning messages reported as part of Bug#13546.
 +
 +2013-02-21  Ken Brown  <kbrown@cornell.edu>
 +
 +      * sheap.c (report_sheap_usage): Fix arguments of message1_no_log.
 +
 +2013-02-20  Stefan Monnier  <monnier@iro.umontreal.ca>
 +
 +      * sheap.c (report_sheap_usage): Prefer message1_nolog.
 +
 +      * keyboard.c (Qcommand_execute): New var.
 +      (command_loop_1, read_char): Use it.
 +      (Fcommand_execute): Remove, replace by an Elisp implementation.
 +      (syms_of_keyboard): Adjust accordingly.
 +
 +2013-02-19  Daniel Colascione <dancol@dancol.org>
 +
 +      * sheap.c (report_sheap_usage): Use message, not message1, so
 +      that we don't try to create a buffer while we're in the middle
 +      of dumping Emacs.  Explain why.
 +
 +2013-02-20  Dmitry Antipov  <dmantipov@yandex.ru>
 +      * search.c (find_newline): Return byte position in bytepos.
 +      Adjust comment.
 +      (find_next_newline_no_quit, find_before_next_newline):
 +      Add bytepos argument.
 +      * lisp.h (find_newline, find_next_newline_no_quit)
 +      (find_before_next_newline): Adjust prototypes.
 +      * bidi.c (bidi_find_paragraph_start):
 +      * editfns.c (Fconstrain_to_field, Fline_end_position):
 +      * indent.c (compute_motion, vmotion):
 +      * xdisp.c (back_to_previous_line_start, forward_to_next_line_start):
 +      (get_visually_first_element, move_it_vertically_backward):
 +      Adjust users and avoid calls to CHAR_TO_BYTE where appropriate.
 +
 +2013-02-19  Eli Zaretskii  <eliz@gnu.org>
  
        * w32proc.c (new_child): Avoid leaking handles if the subprocess
        resources were not orderly released.

diff --cc src/filelock.c
Simple merge

diff --cc src/xdisp.c
Simple merge