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.

2 files changed, 3 insertions, 3 deletions

diff --git a/etc/NEWS b/etc/NEWS
index 49bb4a27c1f..0566ff2e834 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1377,8 +1377,8 @@ files (recursively) under a directory.
 
 +++
 ** New variable `inhibit-message', when bound to non-nil, inhibits
-`message' and related functions from displaying messages the Echo
-Area.  The output is still logged to the *Messages* buffer.
+`message' and related functions from displaying messages in the echo
+area.  The output is still logged to the *Messages* buffer.
 
 +++
 ** A new text property `inhibit-read-only' can be used in read-only
diff --git a/etc/refcards/ru-refcard.tex b/etc/refcards/ru-refcard.tex
index e27a3d244a7..273a79cdc73 100644
--- a/etc/refcards/ru-refcard.tex
+++ b/etc/refcards/ru-refcard.tex
@@ -22,7 +22,7 @@
 \setlength{\ColThreeWidth}{25mm}
 
 \newcommand{\versionemacs}[0]{25} % version of Emacs this is for
-\newcommand{\cyear}[0]{2015}       % copyright year
+\newcommand{\cyear}[0]{2016}       % copyright year
 
 \newcommand\shortcopyrightnotice[0]{\vskip 1ex plus 2 fill
   \centerline{\footnotesize \copyright\ \cyear\ Free Software Foundation, Inc.