diff options
| author | John Wiegley | 2016-01-11 22:48:10 -0800 |
|---|---|---|
| committer | John Wiegley | 2016-01-11 22:48:10 -0800 |
| commit | fb74beed3cf7ed158f18508766ce0ac2685f1d9a (patch) | |
| tree | eebde8bdadc53ef70a3e8602707c8921462ef9d1 /doc/misc | |
| parent | 70f3e4e61fc4433ca8ac4517d247df7e7af7b248 (diff) | |
| parent | 861022ff5f7b8d6ab53c726e009208eadf4ecd41 (diff) | |
| download | emacs-fb74beed3cf7ed158f18508766ce0ac2685f1d9a.tar.gz emacs-fb74beed3cf7ed158f18508766ce0ac2685f1d9a.zip | |
Merge from origin/emacs-25
861022f * doc/misc/texinfo.tex: Revert unwanted copyright change.
46e47a5 ; * etc/refcards/ru-refcard.tex (cyear): Update via M-x set-copyright.
71ea138 * lisp/align.el (align): Simplify a lambda
5618a50 * lisp/align.el (align): Fix arg order in call to `align-region'
1f680db Fix compilation next-error in buffers with selective-display
d20a948 * nsm.el (nsm-check-protocol): Fix typo in the message.
1da116f Add SHA1 warnings for high network security settings
e48bacd ; * etc/NEWS: Typo fix.
Diffstat (limited to 'doc/misc')
| -rw-r--r-- | doc/misc/texinfo.tex | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/doc/misc/texinfo.tex b/doc/misc/texinfo.tex index 0f301a2a716..34fd353a9dc 100644 --- a/doc/misc/texinfo.tex +++ b/doc/misc/texinfo.tex | |||
| @@ -5,7 +5,10 @@ | |||
| 5 | % | 5 | % |
| 6 | \def\texinfoversion{2015-12-17.20} | 6 | \def\texinfoversion{2015-12-17.20} |
| 7 | % | 7 | % |
| 8 | % Copyright 1985-1986, 1988, 1990-2016 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 | ||
| 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 |