aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorPaul Eggert2018-01-09 15:21:44 -0800
committerPaul Eggert2018-01-09 15:22:37 -0800
commit7668717d6fecd610d71b54a33708038b2ede8cce (patch)
treecb635acfc8273c0adf5ef567e57de345244eb76f /doc
parent9e4d523427782ea4e49f4f13b2b99b09660516cc (diff)
downloademacs-7668717d6fecd610d71b54a33708038b2ede8cce.tar.gz
emacs-7668717d6fecd610d71b54a33708038b2ede8cce.zip
Merge from Gnulib
This incorporates: 2018-01-05 maint: Add encoding marker for Emacs to non-ASCII sources 2018-01-04 update-copyright: Handle use of © 2018-01-04 pthread_sigmask: Avoid compilation error on mingw 2018-01-02 stat-time: silence -Wunused-parameter regression * build-aux/config.guess, build-aux/config.sub: * build-aux/update-copyright, doc/misc/texinfo.tex, lib/gnulib.mk.in: * lib/md5.c, lib/md5.h, lib/sha1.c, lib/sha1.h, lib/sha256.c: * lib/sha256.h, lib/sha512.c, lib/sha512.h, lib/signal.in.h: * lib/stat-time.h: Copy from Gnulib, or regenerate.
Diffstat (limited to 'doc')
-rw-r--r--doc/misc/texinfo.tex5
1 files changed, 4 insertions, 1 deletions
diff --git a/doc/misc/texinfo.tex b/doc/misc/texinfo.tex
index b0179d6b007..1987c50ba26 100644
--- a/doc/misc/texinfo.tex
+++ b/doc/misc/texinfo.tex
@@ -5,7 +5,10 @@
5% 5%
6\def\texinfoversion{2017-12-26.21} 6\def\texinfoversion{2017-12-26.21}
7% 7%
8% Copyright 1985-1986, 1988, 1990-2018 Free Software Foundation, Inc. 8% Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
9% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
10% 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017
11% Free Software Foundation, Inc.
9% 12%
10% This texinfo.tex file is free software: you can redistribute it and/or 13% This texinfo.tex file is free software: you can redistribute it and/or
11% modify it under the terms of the GNU General Public License as 14% modify it under the terms of the GNU General Public License as