From: Glenn Morris Date: Thu, 3 Jan 2013 02:37:57 +0000 (-0800) Subject: Merge from emacs-24; up to 2012-12-06T07:33:20Z!rgm@gnu.org X-Git-Tag: emacs-24.3.90~173^2~7^2~414 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0a8bf3afca415fec94742cf830622b22f186062c;p=emacs.git Merge from emacs-24; up to 2012-12-06T07:33:20Z!rgm@gnu.org --- 0a8bf3afca415fec94742cf830622b22f186062c diff --cc doc/lispref/ChangeLog index b837525fb42,400290394ba..4815ac2a482 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@@ -1,4 -1,13 +1,13 @@@ + 2013-01-03 Glenn Morris + + * 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. + -2012-12-31 Glenn Morris +2013-01-02 Glenn Morris * customize.texi (Common Keywords, Type Keywords): Replace "active field" with "button". (Bug#13310) diff --cc lisp/ChangeLog index 081792c9719,04ba7f802ca..0d34da2c049 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@@ -1,4 -1,12 +1,12 @@@ + 2013-01-03 Glenn Morris + + * 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) + -2012-12-31 Andreas Schwab +2013-01-02 Andreas Schwab * 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 nt/emacs.rc index da4283b6fd1,15c8932a295..d2703c45869 --- a/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 59dd7b09f8a,fa04298a18b..d303e3451d0 --- a/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