Merge from emacs-24; up to 2012-12-06T07:33:20Z!rgm@gnu.org

diff --cc configure.ac
Simple merge

diff --cc doc/lispref/ChangeLog
index b837525,4002903..4815ac2
--- 1/doc/lispref/ChangeLog
--- 2/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@@ -1,4 -1,13 +1,13 @@@
 -2012-12-31  Glenn Morris  <rgm@gnu.org>
+ 2013-01-03  Glenn Morris  <rgm@gnu.org>
+ 
+       * processes.texi (System Processes):
+       * syntax.texi (Syntax Table Functions): Tweak some line breaks.
+ 
+       * searching.texi (Replacing Match): Fix xref.
+ 
+       * elisp.texi (DATE): Bump to Jan 2013.
+ 
 +2013-01-02  Glenn Morris  <rgm@gnu.org>
  
        * customize.texi (Common Keywords, Type Keywords):
        Replace "active field" with "button".  (Bug#13310)

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

diff --cc doc/man/emacs.1
Simple merge

diff --cc doc/man/etags.1
Simple merge

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

diff --cc lisp/ChangeLog
index 081792c,04ba7f8..0d34da2
--- 1/lisp/ChangeLog
--- 2/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,4 -1,12 +1,12 @@@
 -2012-12-31  Andreas Schwab  <schwab@linux-m68k.org>
+ 2013-01-03  Glenn Morris  <rgm@gnu.org>
+ 
+       * subr.el (eval-after-load): Don't purecopy the form, so that it
+       can be nconc'd later on; reverts 2009-11-11 change.  (Bug#13331)
+ 
+       * emacs-lisp/byte-run.el (defun): Place cl declarations
+       after any interactive spec.  (Bug#13265)
+ 
 +2013-01-02  Andreas Schwab  <schwab@linux-m68k.org>
  
        * emacs-lisp/byte-run.el (defmacro): Use same argument parsing as
        defun.  Don't check for DECL if DOCSTRING isn't a string.

diff --cc lisp/calc/README
Simple merge

diff --cc lisp/emacs-lisp/byte-run.el
Simple merge

diff --cc lisp/net/tramp-sh.el
Simple merge

diff --cc lisp/subr.el
Simple merge

diff --cc msdos/sed2v2.inp
Simple merge

diff --cc nt/config.nt
Simple merge

diff --cc nt/emacs.rc
index da4283b,15c8932..d2703c4
--- 1/nt/emacs.rc
--- 2/nt/emacs.rc
+++ b/nt/emacs.rc
@@@ -29,12 -29,12 +29,12 @@@ BEGI
        BEGIN
            VALUE "CompanyName", "Free Software Foundation\0"
            VALUE "FileDescription", "GNU Emacs: The extensible self-documenting text editor\0"
 -          VALUE "FileVersion", "24, 2, 91, 0\0"
 +          VALUE "FileVersion", "24, 3, 50, 0\0"
            VALUE "InternalName", "Emacs\0"
-           VALUE "LegalCopyright", "Copyright (C) 2001-2012\0"
+           VALUE "LegalCopyright", "Copyright (C) 2001-2013\0"
            VALUE "OriginalFilename", "emacs.exe"
            VALUE "ProductName", "Emacs\0"
 -          VALUE "ProductVersion", "24, 2, 91, 0\0"
 +          VALUE "ProductVersion", "24, 3, 50, 0\0"
            VALUE "OLESelfRegister", "\0"
         END
       END

diff --cc nt/emacsclient.rc
index 59dd7b0,fa04298..d303e34
--- 1/nt/emacsclient.rc
--- 2/nt/emacsclient.rc
+++ b/nt/emacsclient.rc
@@@ -23,12 -23,12 +23,12 @@@ BEGI
        BEGIN
            VALUE "CompanyName", "Free Software Foundation\0"
            VALUE "FileDescription", "GNU EmacsClient: Client for the extensible self-documenting text editor\0"
 -          VALUE "FileVersion", "24, 2, 91, 0\0"
 +          VALUE "FileVersion", "24, 3, 50, 0\0"
            VALUE "InternalName", "EmacsClient\0"
-           VALUE "LegalCopyright", "Copyright (C) 2001-2012\0"
+           VALUE "LegalCopyright", "Copyright (C) 2001-2013\0"
            VALUE "OriginalFilename", "emacsclientw.exe"
            VALUE "ProductName", "EmacsClient\0"
 -          VALUE "ProductVersion", "24, 2, 91, 0\0"
 +          VALUE "ProductVersion", "24, 3, 50, 0\0"
            VALUE "OLESelfRegister", "\0"
         END
       END

diff --cc src/fns.c
Simple merge