From: John Wiegley <johnw@newartisans.com>
Date: Tue, 12 Jan 2016 06:48:10 +0000 (-0800)
Subject: Merge from origin/emacs-25
X-Git-Tag: emacs-26.0.90~2819^2~11
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=fb74beed3cf7ed158f18508766ce0ac2685f1d9a;p=emacs.git

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.
---

fb74beed3cf7ed158f18508766ce0ac2685f1d9a
diff --cc doc/misc/texinfo.tex
index 0f301a2a716,f140bba94b8..34fd353a9dc
--- a/doc/misc/texinfo.tex
+++ b/doc/misc/texinfo.tex
@@@ -3,9 -3,12 +3,12 @@@
  % Load plain if necessary, i.e., if running under initex.
  \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
  %
 -\def\texinfoversion{2015-12-20.12}
 +\def\texinfoversion{2015-12-17.20}
  %
- % Copyright 1985-1986, 1988, 1990-2016 Free Software Foundation, Inc.
+ % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
+ % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ % 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015
+ % Free Software Foundation, Inc.
  %
  % This texinfo.tex file is free software: you can redistribute it and/or
  % modify it under the terms of the GNU General Public License as