Merge from emacs-24; up to 2012-12-22T02:59:08Z!cyd@gnu.org

diff --cc doc/emacs/ChangeLog
index 83d5b1d25ed5ff856f019a8dce36258dafbfddc6,b11fd82272087f6f90879d3de6fe511c0221cd22..33f530cbadc42dec86fd13b1516b322910357bcb
--- 1/doc/emacs/ChangeLog
--- 2/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@@ -1,16 -1,8 +1,21 @@@
+ 2013-02-22  Glenn Morris  <rgm@gnu.org>
+ 
+       * ack.texi (Acknowledgments):
+       * emacs.texi (Acknowledgments): Small updates.
+ 
 +2013-02-21  Glenn Morris  <rgm@gnu.org>
 +
 +      * files.texi (File Conveniences): Not just GIFs can be animated.
 +
 +2013-02-13  Glenn Morris  <rgm@gnu.org>
 +
 +      * ack.texi (Acknowledgments): Don't mention yow any more.
 +
 +2013-02-13  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +      * cmdargs.texi (General Variables):
 +      Fix TMPDIR documentation to match the code's behavior.
 +
  2013-02-10  Glenn Morris  <rgm@gnu.org>
  
        * trouble.texi (Checklist): Update bug keybinding.

diff --cc doc/emacs/ack.texi
Simple merge

diff --cc doc/misc/ChangeLog
index 4f827073b2fefe9a055ab900d2033ce9c2fd450a,0d6e0785c09bd2a6265df15b116af61bfa27ad0c..9a4f4c106105b998192953d8d005b06bec5f889c
--- 1/doc/misc/ChangeLog
--- 2/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@@ -1,31 -1,7 +1,35 @@@
+ 2013-02-22  Glenn Morris  <rgm@gnu.org>
+ 
+       * flymake.texi (Syntax check statuses): Fix multitable continued rows.
+ 
 +2013-02-21  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +      * Makefile.in (html): New rule.
 +
 +2013-02-20  Michael Albinus  <michael.albinus@gmx.de>
 +
 +      * tramp.texi (Android shell setup): Improve.  Reported by Thierry
 +      Volpiatto <thierry.volpiatto@gmail.com>.
 +
 +2013-02-16  Michael Albinus  <michael.albinus@gmx.de>
 +
 +      * tramp.texi (Top, Configuration): Insert section `Android shell
 +      setup' in menu.
 +      (Android shell setup): New section.
 +      (Connection types, Default Method)
 +      (Frequently Asked Questions): Mention "scp" instead of "scpc".
 +      (External methods): Remove "scpc" and "rsyncc" entries.
 +      (Frequently Asked Questions): Remove entry about ControlPersist.
 +
 +2013-02-13  Glenn Morris  <rgm@gnu.org>
 +
 +      * message.texi (News Headers): Don't mention yow any more.
 +
 +2013-02-09  Jay Belanger  <jay.p.belanger@gmail.com>
 +
 +      * calc.texi (Basic Operations on Units):
 +      (Customizing Calc): Mention the variable `calc-allow-units-as-numbers'.
 +
  2013-02-08  Aidan Gauland  <aidalgol@no8wireless.co.nz>
  
        * eshell.texi: Fill most of the missing sections.

diff --cc lisp/ChangeLog
index 6496fe998d3b138519e0a2dae747b04738e8359a,7a9cdcc20e0eb4e47f668bc4832b1d3e224c56fa..1555dfc43b657c66c9b8bda65bfdfc2060fdda8d
--- 1/lisp/ChangeLog
--- 2/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,30 -1,17 +1,43 @@@
 -2013-02-21  Juri Linkov  <juri@jurta.org>
++2013-02-22  Juri Linkov  <juri@jurta.org>
+ 
+       * isearch.el (isearch-lazy-highlight-new-loop):
+       Set `isearch-lazy-highlight-start' and `isearch-lazy-highlight-end'
+       to `isearch-other-end' if it is not nil.  (Bug#13402)
+ 
+       * replace.el (replace-highlight): Let-bind `isearch-other-end'
+       to `match-beg'.
+ 
+       * textmodes/ispell.el (ispell-highlight-spelling-error-overlay):
+       Let-bind `isearch-other-end' to `start', `isearch-forward' to t
+       and `isearch-error' to nil.
+ 
 -2013-02-20  Fabián Ezequiel Gallina  <fgallina@cuca>
 +2013-02-22  Michael Albinus  <michael.albinus@gmx.de>
 +
 +      * net/tramp.el (tramp-tramp-file-p): Fix docstring.
 +
 +      * net/tramp-sh.el (tramp-sh-handle-insert-directory): Handle
 +      multibyte file names.
 +
 +2013-02-22  Glenn Morris  <rgm@gnu.org>
 +
 +      * textmodes/sgml-mode.el (sgml-xml-mode): Move before use.
 +      (sgml-transformation-function): Give it a :set function.
 +      (sgml-tag): Doc fix.
 +
 +      * cmuscheme.el (scheme-buffer):
 +      * progmodes/inf-lisp.el (inferior-lisp-buffer):
 +      * progmodes/tcl.el (inferior-tcl-buffer):
 +      * textmodes/tex-mode.el (tex-command): Doc fixes.
 +
 +      * image-mode.el (image-mode): Add mouse bindings for mode-line-process.
 +
 +      * htmlfontify.el (hfy-default-header): Encode title string.  (Bug#7457)
 +
 +2013-02-21  Bastien Guerry  <bzg@gnu.org>
 +
 +      * cmuscheme.el (scheme-buffer): Fix docstring.  (Bug#13778)
 +
 +2013-02-21  Fabián Ezequiel Gallina  <fgallina@cuca>
  
        * progmodes/python.el (python-info-current-defun): Enhance
        match-data cluttering prevention.

diff --cc lisp/isearch.el
Simple merge

diff --cc lisp/replace.el
Simple merge

diff --cc lisp/textmodes/ispell.el
Simple merge