Merge from emacs-24; up to 2012-12-06T07:33:20Z!rgm@gnu.org
This commit is contained in:
Glenn Morris
commit
0a8bf3afca
47 changed files with 64 additions and 41 deletions
|
|
@ -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.
|
||||
|
|
|
|||
|
|
@ -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):
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -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
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -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.
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
|
|
@ -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.
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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)))))
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
#
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
|
||||
|
|
|
|||
|
|
@ -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/
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue