diff options
47 files changed, 64 insertions, 41 deletions
diff --git a/configure.ac b/configure.ac index 31f80cc08ca..4a43fcf8fcd 100644 --- a/configure.ac +++ b/configure.ac @@ -4406,7 +4406,7 @@ AC_SUBST(WINDOW_SYSTEM_OBJ) AH_TOP([/* GNU Emacs site configuration template file. -Copyright (C) 1988, 1993-1994, 1999-2002, 2004-2012 +Copyright (C) 1988, 1993-1994, 1999-2002, 2004-2013 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index b837525fb42..4815ac2a482 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,3 +1,12 @@ +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): diff --git a/doc/lispref/elisp.texi b/doc/lispref/elisp.texi index 354591c1915..127b22086d0 100644 --- a/doc/lispref/elisp.texi +++ b/doc/lispref/elisp.texi @@ -56,7 +56,7 @@ @c (See comments for EDITION in emacs.texi) @set VERSION 3.1 @include emacsver.texi -@set DATE May 2012 +@set DATE January 2013 @c in general, keep the following line commented out, unless doing a @c copy of this manual that will be published. The manual should go diff --git a/doc/lispref/processes.texi b/doc/lispref/processes.texi index a5a0ec62beb..50710e23234 100644 --- a/doc/lispref/processes.texi +++ b/doc/lispref/processes.texi @@ -1804,12 +1804,12 @@ The number of threads in the process. @item start The time when the process was started, in the same -@w{@code{(@var{high} @var{low} @var{microsec} @var{picosec})}} format used by -@code{current-time} and by @code{file-attributes}. +@code{(@var{high} @var{low} @var{microsec} @var{picosec})} format used by +@code{file-attributes} and @code{current-time}. @item etime -The time elapsed since the process started, in the @w{@code{(@var{high} -@var{low} @var{microsec} @var{picosec})}} format. +The time elapsed since the process started, in the format @code{(@var{high} +@var{low} @var{microsec} @var{picosec})}. @item vsize The virtual memory size of the process, measured in kilobytes. diff --git a/doc/lispref/searching.texi b/doc/lispref/searching.texi index 1573cceaed6..87d4051d6f0 100644 --- a/doc/lispref/searching.texi +++ b/doc/lispref/searching.texi @@ -1325,7 +1325,7 @@ This stands for a single @samp{\} in the replacement text. @item @samp{\?} This stands for itself (for compatibility with @code{replace-regexp} -and related commands; @pxref{Regexp Replacement,,, emacs, The GNU +and related commands; @pxref{Regexp Replace,,, emacs, The GNU Emacs Manual}). @end table diff --git a/doc/lispref/syntax.texi b/doc/lispref/syntax.texi index a07f45c100b..dfa121103bc 100644 --- a/doc/lispref/syntax.texi +++ b/doc/lispref/syntax.texi @@ -478,17 +478,17 @@ it easier to see the character returned by @code{char-syntax}.) @end group @group -;; Forward slash characters have punctuation syntax. Note that this -;; @code{char-syntax} call does not reveal that it is also part of -;; comment-start and -end sequences. +;; Forward slash characters have punctuation syntax. +;; Note that this @code{char-syntax} call does not reveal +;; that it is also part of comment-start and -end sequences. (string (char-syntax ?/)) @result{} "." @end group @group -;; Open parenthesis characters have open parenthesis syntax. Note -;; that this @code{char-syntax} call does not reveal that it has a -;; matching character, @samp{)}. +;; Open parenthesis characters have open parenthesis syntax. +;; Note that this @code{char-syntax} call does not reveal that +;; it has a matching character, @samp{)}. (string (char-syntax ?\()) @result{} "(" @end group diff --git a/doc/man/ebrowse.1 b/doc/man/ebrowse.1 index 84f1ef1dd9b..89506db98ef 100644 --- a/doc/man/ebrowse.1 +++ b/doc/man/ebrowse.1 @@ -85,7 +85,7 @@ was written by Gerd Moellmann. Copyright .if t \(co .if n (C) -2008-2012 Free Software Foundation, Inc. +2008-2013 Free Software Foundation, Inc. .PP Permission is granted to make and distribute verbatim copies of this document provided the copyright notice and this permission notice are diff --git a/doc/man/emacs.1 b/doc/man/emacs.1 index 46bda023b5a..3d0c5107adc 100644 --- a/doc/man/emacs.1 +++ b/doc/man/emacs.1 @@ -642,7 +642,7 @@ For detailed credits and acknowledgments, see the GNU Emacs manual. Copyright .if t \(co .if n (C) -1995, 1999-2012 Free Software Foundation, Inc. +1995, 1999-2013 Free Software Foundation, Inc. .PP Permission is granted to make and distribute verbatim copies of this document provided the copyright notice and this permission notice are diff --git a/doc/man/etags.1 b/doc/man/etags.1 index 3f22364a194..94fe2af1a8a 100644 --- a/doc/man/etags.1 +++ b/doc/man/etags.1 @@ -268,7 +268,7 @@ Stallman. Copyright .if t \(co .if n (C) -1992, 1999, 2001-2012 Free Software Foundation, Inc. +1992, 1999, 2001-2013 Free Software Foundation, Inc. .PP Permission is granted to make and distribute verbatim copies of this document provided the copyright notice and this permission notice are diff --git a/doc/man/grep-changelog.1 b/doc/man/grep-changelog.1 index 397e6493343..ef4b2900988 100644 --- a/doc/man/grep-changelog.1 +++ b/doc/man/grep-changelog.1 @@ -62,7 +62,7 @@ Display basic usage information. Copyright .if t \(co .if n (C) -2008-2012 Free Software Foundation, Inc. +2008-2013 Free Software Foundation, Inc. .PP Permission is granted to make and distribute verbatim copies of this document provided the copyright notice and this permission notice are diff --git a/doc/misc/wisent.texi b/doc/misc/wisent.texi index bd12fe5ab8a..d8557b84a4f 100644 --- a/doc/misc/wisent.texi +++ b/doc/misc/wisent.texi @@ -23,7 +23,7 @@ @c %**end of header @copying -Copyright @copyright{} 1988--1993, 1995, 1998--2004, 2007, 2012 +Copyright @copyright{} 1988--1993, 1995, 1998--2004, 2007, 2012--2013 Free Software Foundation, Inc. @c Since we are both GNU manuals, we do not need to ack each other here. diff --git a/etc/refcards/calccard.pdf b/etc/refcards/calccard.pdf Binary files differindex 5e97c2a9d92..8d39aa013a0 100644 --- a/etc/refcards/calccard.pdf +++ b/etc/refcards/calccard.pdf diff --git a/etc/refcards/cs-dired-ref.pdf b/etc/refcards/cs-dired-ref.pdf Binary files differindex 1b5a8612ed9..0e6232a800d 100644 --- a/etc/refcards/cs-dired-ref.pdf +++ b/etc/refcards/cs-dired-ref.pdf diff --git a/etc/refcards/cs-refcard.pdf b/etc/refcards/cs-refcard.pdf Binary files differindex 963adcc7bb9..a032a7ce407 100644 --- a/etc/refcards/cs-refcard.pdf +++ b/etc/refcards/cs-refcard.pdf diff --git a/etc/refcards/de-refcard.pdf b/etc/refcards/de-refcard.pdf Binary files differindex bccc60993f6..84c0f4c121a 100644 --- a/etc/refcards/de-refcard.pdf +++ b/etc/refcards/de-refcard.pdf diff --git a/etc/refcards/dired-ref.pdf b/etc/refcards/dired-ref.pdf Binary files differindex 0f579670808..b80daa90638 100644 --- a/etc/refcards/dired-ref.pdf +++ b/etc/refcards/dired-ref.pdf diff --git a/etc/refcards/emacsver.tex b/etc/refcards/emacsver.tex index 620ee8ef9e0..72a7d96d1ff 100644 --- a/etc/refcards/emacsver.tex +++ b/etc/refcards/emacsver.tex @@ -1,4 +1,4 @@ %% This file is not generated by configure, because then the provided %% pdf files would always appear out-of-date. \def\versionemacs{24} % major version of emacs -\def\year{2012} % latest copyright year +\def\year{2013} % latest copyright year diff --git a/etc/refcards/fr-dired-ref.pdf b/etc/refcards/fr-dired-ref.pdf Binary files differindex 32f12ab2088..77b36c3f2a7 100644 --- a/etc/refcards/fr-dired-ref.pdf +++ b/etc/refcards/fr-dired-ref.pdf diff --git a/etc/refcards/fr-refcard.pdf b/etc/refcards/fr-refcard.pdf Binary files differindex 020ffbdeea0..5fdf2998e4b 100644 --- a/etc/refcards/fr-refcard.pdf +++ b/etc/refcards/fr-refcard.pdf diff --git a/etc/refcards/gnus-booklet.pdf b/etc/refcards/gnus-booklet.pdf Binary files differindex 6c8fa376234..6cc54baaead 100644 --- a/etc/refcards/gnus-booklet.pdf +++ b/etc/refcards/gnus-booklet.pdf diff --git a/etc/refcards/gnus-refcard.pdf b/etc/refcards/gnus-refcard.pdf Binary files differindex c64ed30f39f..7a1c5b3bcab 100644 --- a/etc/refcards/gnus-refcard.pdf +++ b/etc/refcards/gnus-refcard.pdf diff --git a/etc/refcards/orgcard.pdf b/etc/refcards/orgcard.pdf Binary files differindex 720f08d9ded..ccc02ae7968 100644 --- a/etc/refcards/orgcard.pdf +++ b/etc/refcards/orgcard.pdf diff --git a/etc/refcards/pl-refcard.pdf b/etc/refcards/pl-refcard.pdf Binary files differindex ddeeca97daa..b832990fb1c 100644 --- a/etc/refcards/pl-refcard.pdf +++ b/etc/refcards/pl-refcard.pdf diff --git a/etc/refcards/pt-br-refcard.pdf b/etc/refcards/pt-br-refcard.pdf Binary files differindex dc61712a998..200425f27d7 100644 --- a/etc/refcards/pt-br-refcard.pdf +++ b/etc/refcards/pt-br-refcard.pdf diff --git a/etc/refcards/refcard.pdf b/etc/refcards/refcard.pdf Binary files differindex f2a720d656b..1d3b630bfc5 100644 --- a/etc/refcards/refcard.pdf +++ b/etc/refcards/refcard.pdf diff --git a/etc/refcards/ru-refcard.pdf b/etc/refcards/ru-refcard.pdf Binary files differindex 2289acff755..f415fd5574d 100644 --- a/etc/refcards/ru-refcard.pdf +++ b/etc/refcards/ru-refcard.pdf diff --git a/etc/refcards/ru-refcard.tex b/etc/refcards/ru-refcard.tex index 765b8085147..c44110352cb 100644 --- a/etc/refcards/ru-refcard.tex +++ b/etc/refcards/ru-refcard.tex @@ -22,7 +22,7 @@ \setlength{\ColThreeWidth}{25mm} \newcommand{\versionemacs}[0]{24} % version of Emacs this is for -\newcommand{\cyear}[0]{2012} % copyright year +\newcommand{\cyear}[0]{2013} % copyright year \newcommand\shortcopyrightnotice[0]{\vskip 1ex plus 2 fill \centerline{\footnotesize \copyright\ \cyear\ Free Software Foundation, Inc. diff --git a/etc/refcards/sk-dired-ref.pdf b/etc/refcards/sk-dired-ref.pdf Binary files differindex 2cd9ef12fd9..f3cb4f64368 100644 --- a/etc/refcards/sk-dired-ref.pdf +++ b/etc/refcards/sk-dired-ref.pdf diff --git a/etc/refcards/sk-refcard.pdf b/etc/refcards/sk-refcard.pdf Binary files differindex e02c7db3d4c..d4a85a3d4b9 100644 --- a/etc/refcards/sk-refcard.pdf +++ b/etc/refcards/sk-refcard.pdf diff --git a/lib-src/rcs2log b/lib-src/rcs2log index 724bd4d696c..4f2bb3308fc 100755 --- a/lib-src/rcs2log +++ b/lib-src/rcs2log @@ -20,7 +20,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. -Copyright='Copyright (C) 2012 Free Software Foundation, Inc. +Copyright='Copyright (C) 2013 Free Software Foundation, Inc. This program comes with NO WARRANTY, to the extent permitted by law. You may redistribute copies of this program under the terms of the GNU General Public License. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 081792c9719..0d34da2c049 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,11 @@ +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 diff --git a/lisp/calc/README b/lisp/calc/README index bae9e7ab177..c44ffe5aef0 100644 --- a/lisp/calc/README +++ b/lisp/calc/README @@ -5,7 +5,7 @@ See the end of the file for license conditions. This directory contains Calc, an advanced desk calculator for GNU Emacs. -"Calc" Copyright (C) 1990-1993, 2001-2012 Free Software Foundation, Inc. +"Calc" Copyright (C) 1990-1993, 2001-2013 Free Software Foundation, Inc. Written by: Dave Gillespie diff --git a/lisp/cedet/semantic/imenu.el b/lisp/cedet/semantic/imenu.el index 22a23e526a2..370f651b93d 100644 --- a/lisp/cedet/semantic/imenu.el +++ b/lisp/cedet/semantic/imenu.el @@ -1,6 +1,6 @@ ;;; semantic/imenu.el --- Use Semantic as an imenu tag generator -;;; Copyright (C) 2000-2005, 2007-2008, 2010-2012 +;;; Copyright (C) 2000-2005, 2007-2008, 2010-2013 ;; Free Software Foundation, Inc. ;; Author: Eric M. Ludlam <zappo@gnu.org> diff --git a/lisp/emacs-lisp/byte-run.el b/lisp/emacs-lisp/byte-run.el index 3168ddb16e5..b44ec68e2bf 100644 --- a/lisp/emacs-lisp/byte-run.el +++ b/lisp/emacs-lisp/byte-run.el @@ -199,7 +199,13 @@ The return value is undefined. (memq (car x) ;C.f. cl-do-proclaim. '(special inline notinline optimize warn))) (push (list 'declare x) - (if (stringp docstring) (cdr body) body)) + (if (stringp docstring) + (if (eq (car-safe (cadr body)) 'interactive) + (cddr body) + (cdr body)) + (if (eq (car-safe (car body)) 'interactive) + (cdr body) + body))) nil) (t (message "Warning: Unknown defun property `%S' in %S" (car x) name))))) diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index 58ad7a6661f..5bbf1708654 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el @@ -805,7 +805,7 @@ on the remote host.") (defconst tramp-perl-encode "%s -e ' # This script contributed by Juanma Barranquero <lektu@terra.es>. -# Copyright (C) 2002-2012 Free Software Foundation, Inc. +# Copyright (C) 2002-2013 Free Software Foundation, Inc. use strict; my %%trans = do { @@ -843,7 +843,7 @@ This string is passed to `format', so percent characters need to be doubled.") (defconst tramp-perl-decode "%s -e ' # This script contributed by Juanma Barranquero <lektu@terra.es>. -# Copyright (C) 2002-2012 Free Software Foundation, Inc. +# Copyright (C) 2002-2013 Free Software Foundation, Inc. use strict; my %%trans = do { diff --git a/lisp/org/org-html.el b/lisp/org/org-html.el index d7c86b08a9e..91df2ebcc4e 100644 --- a/lisp/org/org-html.el +++ b/lisp/org/org-html.el @@ -104,7 +104,7 @@ not be modified." @licstart The following is the entire license notice for the JavaScript code in this tag. -Copyright (C) 2012 Free Software Foundation, Inc. +Copyright (C) 2012-2013 Free Software Foundation, Inc. The JavaScript code in this tag is free software: you can redistribute it and/or modify it under the terms of the GNU @@ -351,7 +351,7 @@ You can also customize this for each buffer, using something like @licstart The following is the entire license notice for the JavaScript code below. -Copyright (C) 2012 Free Software Foundation, Inc. +Copyright (C) 2012-2013 Free Software Foundation, Inc. The JavaScript code below is free software: you can redistribute it and/or modify it under the terms of the GNU diff --git a/lisp/org/org-jsinfo.el b/lisp/org/org-jsinfo.el index 037afe843af..9a4046fff8b 100644 --- a/lisp/org/org-jsinfo.el +++ b/lisp/org/org-jsinfo.el @@ -141,7 +141,7 @@ means to use the maximum value consistent with other options." @licstart The following is the entire license notice for the JavaScript code in this tag. -Copyright (C) 2012 Free Software Foundation, Inc. +Copyright (C) 2012-2013 Free Software Foundation, Inc. The JavaScript code in this tag is free software: you can redistribute it and/or modify it under the terms of the GNU diff --git a/lisp/subr.el b/lisp/subr.el index 3e842ffb8c6..7ca0169abdb 100644 --- a/lisp/subr.el +++ b/lisp/subr.el @@ -1867,7 +1867,7 @@ This function makes or adds to an entry on `after-load-alist'." ,form))) ;; Add FORM to the element unless it's already there. (unless (member form (cdr elt)) - (nconc elt (purecopy (list form))))))) + (nconc elt (list form)))))) (defvar after-load-functions nil "Special hook run after loading a file. diff --git a/msdos/README b/msdos/README index ba97312130a..9b5b71495cf 100644 --- a/msdos/README +++ b/msdos/README @@ -10,7 +10,7 @@ The files emacs.ico and emacs.pif are for using the DJGPP version on Windows 3.X. Since these are binary files, their copyright notice is reproduced here: -# Copyright (C) 1993, 2002-2012 Free Software Foundation, Inc. +# Copyright (C) 1993, 2002-2013 Free Software Foundation, Inc. # # This file is part of GNU Emacs. # diff --git a/msdos/depfiles.bat b/msdos/depfiles.bat index 049f1c3602c..df71fc22179 100644 --- a/msdos/depfiles.bat +++ b/msdos/depfiles.bat @@ -1,7 +1,7 @@ @echo off
rem ----------------------------------------------------------------------
rem Auxiliary script for MSDOS, run by ../config.bat
-rem Copyright (C) 2011-2012 Free Software Foundation, Inc.
+rem Copyright (C) 2011-2013 Free Software Foundation, Inc.
rem This file is part of GNU Emacs.
diff --git a/msdos/sed2v2.inp b/msdos/sed2v2.inp index 607ff4d7e8b..bde8648b41e 100644 --- a/msdos/sed2v2.inp +++ b/msdos/sed2v2.inp @@ -31,7 +31,7 @@ #ifndef MSDOS\ #define MSDOS\ #endif -/^#undef COPYRIGHT *$/s/^.*$/#define COPYRIGHT "Copyright (C) 2012 Free Software Foundation, Inc."/ +/^#undef COPYRIGHT *$/s/^.*$/#define COPYRIGHT "Copyright (C) 2013 Free Software Foundation, Inc."/ /^#undef DIRECTORY_SEP *$/s!^.*$!#define DIRECTORY_SEP '/'! /^#undef DOS_NT *$/s/^.*$/#define DOS_NT/ /^#undef FLOAT_CHECK_DOMAIN *$/s/^.*$/#define FLOAT_CHECK_DOMAIN/ diff --git a/nt/config.nt b/nt/config.nt index f425f6a98ea..24bf6814829 100644 --- a/nt/config.nt +++ b/nt/config.nt @@ -78,7 +78,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #undef CLASH_DETECTION /* Short copyright string for this version of Emacs. */ -#define COPYRIGHT "Copyright (C) 2012 Free Software Foundation, Inc." +#define COPYRIGHT "Copyright (C) 2013 Free Software Foundation, Inc." /* Define to one of '_getb67', 'GETB67', 'getb67' for Cray-2 and Cray-YMP systems. This function is required for 'alloca.c' support on those systems. diff --git a/nt/configure.bat b/nt/configure.bat index 3118bb11e5d..f833da72269 100755 --- a/nt/configure.bat +++ b/nt/configure.bat @@ -1,7 +1,7 @@ @echo off
rem ----------------------------------------------------------------------
rem Configuration script for MS Windows operating systems
-rem Copyright (C) 1999-2012 Free Software Foundation, Inc.
+rem Copyright (C) 1999-2013 Free Software Foundation, Inc.
rem This file is part of GNU Emacs.
diff --git a/nt/emacs.rc b/nt/emacs.rc index da4283b6fd1..d2703c45869 100644 --- a/nt/emacs.rc +++ b/nt/emacs.rc @@ -31,7 +31,7 @@ BEGIN VALUE "FileDescription", "GNU Emacs: The extensible self-documenting text editor\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, 3, 50, 0\0" diff --git a/nt/emacsclient.rc b/nt/emacsclient.rc index 59dd7b09f8a..d303e3451d0 100644 --- a/nt/emacsclient.rc +++ b/nt/emacsclient.rc @@ -25,7 +25,7 @@ BEGIN VALUE "FileDescription", "GNU EmacsClient: Client for the extensible self-documenting text editor\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, 3, 50, 0\0" diff --git a/nt/icons/README b/nt/icons/README index 0254080400d..d77b81de9c2 100644 --- a/nt/icons/README +++ b/nt/icons/README @@ -8,7 +8,7 @@ License: GNU General Public License version 3 or later File: emacs22.ico Author: Andrew Zhilin -Copyright (C) 2005-2012 Free Software Foundation, Inc. +Copyright (C) 2005-2013 Free Software Foundation, Inc. License: GNU General Public License version 3 or later (see COPYING) @@ -17,7 +17,7 @@ Files: gnu2a32.ico gnu2a32t.ico gnu2b48.ico gnu2b48t.ico gnu5w32.ico gnu5w32t.ico gnu6w48.ico gnu6w48t.ico gnu7.ico gnu8.ico gnu9.ico Author: Rob Davenport <rgd at bigfoot.com> -Copyright (C) 1999, 2001-2012 Free Software Foundation, Inc. +Copyright (C) 1999, 2001-2013 Free Software Foundation, Inc. License: GNU General Public License version 3 or later (see COPYING) <http://users.adelphia.net/~rob.davenport/gnuicons.html> diff --git a/src/fns.c b/src/fns.c index 4c6e537ea84..3beed018648 100644 --- a/src/fns.c +++ b/src/fns.c @@ -1,6 +1,6 @@ /* Random utility Lisp functions. - Copyright (C) 1985-1987, 1993-1995, 1997-2012 - Free Software Foundation, Inc. + +Copyright (C) 1985-1987, 1993-1995, 1997-2013 Free Software Foundation, Inc. This file is part of GNU Emacs. |