[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r111408: Merge from emacs-24; up to r
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r111408: Merge from emacs-24; up to r111123 |
Date: |
Wed, 02 Jan 2013 18:37:57 -0800 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 111408 [merge]
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2013-01-02 18:37:57 -0800
message:
Merge from emacs-24; up to r111123
modified:
configure.ac
doc/lispref/ChangeLog
doc/lispref/elisp.texi
doc/lispref/processes.texi
doc/lispref/searching.texi
doc/lispref/syntax.texi
doc/man/ebrowse.1
doc/man/emacs.1
doc/man/etags.1
doc/man/grep-changelog.1
doc/misc/wisent.texi
etc/refcards/calccard.pdf
etc/refcards/cs-dired-ref.pdf
etc/refcards/cs-refcard.pdf
etc/refcards/de-refcard.pdf
etc/refcards/dired-ref.pdf
etc/refcards/emacsver.tex
etc/refcards/fr-dired-ref.pdf
etc/refcards/fr-refcard.pdf
etc/refcards/gnus-booklet.pdf
etc/refcards/gnus-refcard.pdf
etc/refcards/orgcard.pdf
etc/refcards/pl-refcard.pdf
etc/refcards/pt-br-refcard.pdf
etc/refcards/refcard.pdf
etc/refcards/ru-refcard.pdf
etc/refcards/ru-refcard.tex
etc/refcards/sk-dired-ref.pdf
etc/refcards/sk-refcard.pdf
lib-src/rcs2log
lisp/ChangeLog
lisp/calc/README
lisp/cedet/semantic/imenu.el
lisp/emacs-lisp/byte-run.el
lisp/net/tramp-sh.el
lisp/org/org-html.el
lisp/org/org-jsinfo.el
lisp/subr.el
msdos/README
msdos/depfiles.bat
msdos/sed2v2.inp
nt/config.nt
nt/configure.bat
nt/emacs.rc
nt/emacsclient.rc
nt/icons/README
src/fns.c
=== modified file 'configure.ac'
--- a/configure.ac 2013-01-02 16:13:04 +0000
+++ b/configure.ac 2013-01-03 02:37:57 +0000
@@ -4406,7 +4406,7 @@
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.
=== modified file 'doc/lispref/ChangeLog'
--- a/doc/lispref/ChangeLog 2013-01-02 19:02:05 +0000
+++ b/doc/lispref/ChangeLog 2013-01-03 02:37:57 +0000
@@ -1,3 +1,12 @@
+2013-01-03 Glenn Morris <address@hidden>
+
+ * 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 <address@hidden>
* customize.texi (Common Keywords, Type Keywords):
=== modified file 'doc/lispref/elisp.texi'
--- a/doc/lispref/elisp.texi 2013-01-02 16:13:04 +0000
+++ b/doc/lispref/elisp.texi 2013-01-03 02:37:57 +0000
@@ -56,7 +56,7 @@
@c (See comments for EDITION in emacs.texi)
@set VERSION 3.1
@include emacsver.texi
address@hidden DATE May 2012
address@hidden 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
=== modified file 'doc/lispref/processes.texi'
--- a/doc/lispref/processes.texi 2013-01-01 09:11:05 +0000
+++ b/doc/lispref/processes.texi 2013-01-03 02:23:39 +0000
@@ -1804,12 +1804,12 @@
@item start
The time when the process was started, in the same
address@hidden@code{(@var{high} @var{low} @var{microsec} @var{picosec})}}
format used by
address@hidden and by @code{file-attributes}.
address@hidden(@var{high} @var{low} @var{microsec} @var{picosec})} format used
by
address@hidden and @code{current-time}.
@item etime
-The time elapsed since the process started, in the @address@hidden(@var{high}
address@hidden @var{microsec} @var{picosec})}} format.
+The time elapsed since the process started, in the format @code{(@var{high}
address@hidden @var{microsec} @var{picosec})}.
@item vsize
The virtual memory size of the process, measured in kilobytes.
=== modified file 'doc/lispref/searching.texi'
--- a/doc/lispref/searching.texi 2013-01-01 09:11:05 +0000
+++ b/doc/lispref/searching.texi 2013-01-03 02:15:57 +0000
@@ -1325,7 +1325,7 @@
@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
=== modified file 'doc/lispref/syntax.texi'
--- a/doc/lispref/syntax.texi 2013-01-01 09:11:05 +0000
+++ b/doc/lispref/syntax.texi 2013-01-03 02:23:39 +0000
@@ -478,17 +478,17 @@
@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
=== modified file 'doc/man/ebrowse.1'
--- a/doc/man/ebrowse.1 2012-01-19 07:21:25 +0000
+++ b/doc/man/ebrowse.1 2013-01-03 01:35:49 +0000
@@ -85,7 +85,7 @@
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
=== modified file 'doc/man/emacs.1'
--- a/doc/man/emacs.1 2012-12-21 19:32:43 +0000
+++ b/doc/man/emacs.1 2013-01-03 02:37:57 +0000
@@ -642,7 +642,7 @@
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
=== modified file 'doc/man/etags.1'
--- a/doc/man/etags.1 2012-12-02 01:47:56 +0000
+++ b/doc/man/etags.1 2013-01-03 02:37:57 +0000
@@ -268,7 +268,7 @@
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
=== modified file 'doc/man/grep-changelog.1'
--- a/doc/man/grep-changelog.1 2012-01-19 07:21:25 +0000
+++ b/doc/man/grep-changelog.1 2013-01-03 01:35:49 +0000
@@ -62,7 +62,7 @@
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
=== modified file 'doc/misc/wisent.texi'
--- a/doc/misc/wisent.texi 2012-12-27 08:21:08 +0000
+++ b/doc/misc/wisent.texi 2013-01-03 02:37:57 +0000
@@ -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.
=== modified file 'etc/refcards/calccard.pdf'
Binary files a/etc/refcards/calccard.pdf 2012-04-30 07:46:03 +0000 and
b/etc/refcards/calccard.pdf 2013-01-03 02:11:33 +0000 differ
=== modified file 'etc/refcards/cs-dired-ref.pdf'
Binary files a/etc/refcards/cs-dired-ref.pdf 2012-04-30 07:46:03 +0000 and
b/etc/refcards/cs-dired-ref.pdf 2013-01-03 02:11:33 +0000 differ
=== modified file 'etc/refcards/cs-refcard.pdf'
Binary files a/etc/refcards/cs-refcard.pdf 2012-04-30 07:46:03 +0000 and
b/etc/refcards/cs-refcard.pdf 2013-01-03 02:11:33 +0000 differ
=== modified file 'etc/refcards/de-refcard.pdf'
Binary files a/etc/refcards/de-refcard.pdf 2012-04-30 07:46:03 +0000 and
b/etc/refcards/de-refcard.pdf 2013-01-03 02:11:33 +0000 differ
=== modified file 'etc/refcards/dired-ref.pdf'
Binary files a/etc/refcards/dired-ref.pdf 2012-04-30 07:46:03 +0000 and
b/etc/refcards/dired-ref.pdf 2013-01-03 02:11:33 +0000 differ
=== modified file 'etc/refcards/emacsver.tex'
--- a/etc/refcards/emacsver.tex 2012-09-17 07:22:17 +0000
+++ b/etc/refcards/emacsver.tex 2013-01-03 01:35:49 +0000
@@ -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
=== modified file 'etc/refcards/fr-dired-ref.pdf'
Binary files a/etc/refcards/fr-dired-ref.pdf 2012-04-30 07:46:03 +0000 and
b/etc/refcards/fr-dired-ref.pdf 2013-01-03 02:11:33 +0000 differ
=== modified file 'etc/refcards/fr-refcard.pdf'
Binary files a/etc/refcards/fr-refcard.pdf 2012-04-30 07:46:03 +0000 and
b/etc/refcards/fr-refcard.pdf 2013-01-03 02:11:33 +0000 differ
=== modified file 'etc/refcards/gnus-booklet.pdf'
Binary files a/etc/refcards/gnus-booklet.pdf 2012-04-30 07:46:03 +0000 and
b/etc/refcards/gnus-booklet.pdf 2013-01-03 02:11:33 +0000 differ
=== modified file 'etc/refcards/gnus-refcard.pdf'
Binary files a/etc/refcards/gnus-refcard.pdf 2012-04-30 07:46:03 +0000 and
b/etc/refcards/gnus-refcard.pdf 2013-01-03 02:11:33 +0000 differ
=== modified file 'etc/refcards/orgcard.pdf'
Binary files a/etc/refcards/orgcard.pdf 2012-10-26 14:42:05 +0000 and
b/etc/refcards/orgcard.pdf 2013-01-03 02:11:33 +0000 differ
=== modified file 'etc/refcards/pl-refcard.pdf'
Binary files a/etc/refcards/pl-refcard.pdf 2012-04-30 07:46:03 +0000 and
b/etc/refcards/pl-refcard.pdf 2013-01-03 02:11:33 +0000 differ
=== modified file 'etc/refcards/pt-br-refcard.pdf'
Binary files a/etc/refcards/pt-br-refcard.pdf 2012-04-30 07:46:03 +0000 and
b/etc/refcards/pt-br-refcard.pdf 2013-01-03 02:11:33 +0000 differ
=== modified file 'etc/refcards/refcard.pdf'
Binary files a/etc/refcards/refcard.pdf 2012-04-30 07:46:03 +0000 and
b/etc/refcards/refcard.pdf 2013-01-03 02:11:33 +0000 differ
=== modified file 'etc/refcards/ru-refcard.pdf'
Binary files a/etc/refcards/ru-refcard.pdf 2012-04-30 07:46:03 +0000 and
b/etc/refcards/ru-refcard.pdf 2013-01-03 02:11:33 +0000 differ
=== modified file 'etc/refcards/ru-refcard.tex'
--- a/etc/refcards/ru-refcard.tex 2013-01-01 09:11:05 +0000
+++ b/etc/refcards/ru-refcard.tex 2013-01-03 01:35:49 +0000
@@ -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.
=== modified file 'etc/refcards/sk-dired-ref.pdf'
Binary files a/etc/refcards/sk-dired-ref.pdf 2012-04-30 07:46:03 +0000 and
b/etc/refcards/sk-dired-ref.pdf 2013-01-03 02:11:33 +0000 differ
=== modified file 'etc/refcards/sk-refcard.pdf'
Binary files a/etc/refcards/sk-refcard.pdf 2012-04-30 07:46:03 +0000 and
b/etc/refcards/sk-refcard.pdf 2013-01-03 02:11:33 +0000 differ
=== modified file 'lib-src/rcs2log'
--- a/lib-src/rcs2log 2013-01-01 09:11:05 +0000
+++ b/lib-src/rcs2log 2013-01-03 01:35:49 +0000
@@ -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.
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2013-01-03 00:38:32 +0000
+++ b/lisp/ChangeLog 2013-01-03 02:37:57 +0000
@@ -1,3 +1,11 @@
+2013-01-03 Glenn Morris <address@hidden>
+
+ * 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 <address@hidden>
* emacs-lisp/byte-run.el (defmacro): Use same argument parsing as
=== modified file 'lisp/calc/README'
--- a/lisp/calc/README 2013-01-02 16:13:04 +0000
+++ b/lisp/calc/README 2013-01-03 02:37:57 +0000
@@ -5,7 +5,7 @@
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
=== modified file 'lisp/cedet/semantic/imenu.el'
--- a/lisp/cedet/semantic/imenu.el 2012-01-19 07:21:25 +0000
+++ b/lisp/cedet/semantic/imenu.el 2013-01-03 01:35:49 +0000
@@ -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 <address@hidden>
=== modified file 'lisp/emacs-lisp/byte-run.el'
--- a/lisp/emacs-lisp/byte-run.el 2013-01-02 16:13:04 +0000
+++ b/lisp/emacs-lisp/byte-run.el 2013-01-03 02:37:57 +0000
@@ -199,7 +199,13 @@
(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)))))
=== modified file 'lisp/net/tramp-sh.el'
--- a/lisp/net/tramp-sh.el 2013-01-02 16:13:04 +0000
+++ b/lisp/net/tramp-sh.el 2013-01-03 02:37:57 +0000
@@ -805,7 +805,7 @@
(defconst tramp-perl-encode
"%s -e '
# This script contributed by Juanma Barranquero <address@hidden>.
-# 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 @@
(defconst tramp-perl-decode
"%s -e '
# This script contributed by Juanma Barranquero <address@hidden>.
-# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+# Copyright (C) 2002-2013 Free Software Foundation, Inc.
use strict;
my %%trans = do {
=== modified file 'lisp/org/org-html.el'
--- a/lisp/org/org-html.el 2013-01-01 09:11:05 +0000
+++ b/lisp/org/org-html.el 2013-01-03 01:46:47 +0000
@@ -104,7 +104,7 @@
@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 @@
@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
=== modified file 'lisp/org/org-jsinfo.el'
--- a/lisp/org/org-jsinfo.el 2013-01-01 09:11:05 +0000
+++ b/lisp/org/org-jsinfo.el 2013-01-03 01:46:47 +0000
@@ -141,7 +141,7 @@
@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
=== modified file 'lisp/subr.el'
--- a/lisp/subr.el 2013-01-02 16:13:04 +0000
+++ b/lisp/subr.el 2013-01-03 02:37:57 +0000
@@ -1867,7 +1867,7 @@
,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.
=== modified file 'msdos/README'
--- a/msdos/README 2013-01-01 09:11:05 +0000
+++ b/msdos/README 2013-01-03 01:49:08 +0000
@@ -10,7 +10,7 @@
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.
#
=== modified file 'msdos/depfiles.bat'
--- a/msdos/depfiles.bat 2012-01-05 09:46:05 +0000
+++ b/msdos/depfiles.bat 2013-01-03 01:35:49 +0000
@@ -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.
=== modified file 'msdos/sed2v2.inp'
--- a/msdos/sed2v2.inp 2013-01-02 16:13:04 +0000
+++ b/msdos/sed2v2.inp 2013-01-03 02:37:57 +0000
@@ -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/
=== modified file 'nt/config.nt'
--- a/nt/config.nt 2013-01-02 16:13:04 +0000
+++ b/nt/config.nt 2013-01-03 02:37:57 +0000
@@ -78,7 +78,7 @@
#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.
=== modified file 'nt/configure.bat'
--- a/nt/configure.bat 2012-10-17 19:02:44 +0000
+++ b/nt/configure.bat 2013-01-03 01:35:49 +0000
@@ -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.
=== modified file 'nt/emacs.rc'
--- a/nt/emacs.rc 2012-12-21 19:32:43 +0000
+++ b/nt/emacs.rc 2013-01-03 02:37:57 +0000
@@ -31,7 +31,7 @@
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"
=== modified file 'nt/emacsclient.rc'
--- a/nt/emacsclient.rc 2012-12-21 19:32:43 +0000
+++ b/nt/emacsclient.rc 2013-01-03 02:37:57 +0000
@@ -25,7 +25,7 @@
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"
=== modified file 'nt/icons/README'
--- a/nt/icons/README 2013-01-01 09:11:05 +0000
+++ b/nt/icons/README 2013-01-03 01:46:47 +0000
@@ -8,7 +8,7 @@
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 @@
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>
=== modified file 'src/fns.c'
--- a/src/fns.c 2012-12-21 19:32:43 +0000
+++ b/src/fns.c 2013-01-03 02:37:57 +0000
@@ -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.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r111408: Merge from emacs-24; up to r111123,
Glenn Morris <=