Merge from origin/emacs-25

42614fa Update remaining copyright years with admin.el M-x set-copyright
f17a006 * lisp/ffap.el (ffap-lax-url): Bump :version after recent cha...

diff --cc etc/refcards/ru-refcard.tex
index c961f7a2a020c3aa2731200a7cb633da19b47bf6,700a2096a56b67b748a90abb090919db026830d0..fad75ddda4771b6e32773f18e11e0429d15dec0a
--- 1/etc/refcards/ru-refcard.tex
--- 2/etc/refcards/ru-refcard.tex
+++ b/etc/refcards/ru-refcard.tex
@@@ -40,8 -40,8 +40,8 @@@
  \newlength{\ColThreeWidth}
  \setlength{\ColThreeWidth}{25mm}
  
 -\newcommand{\versionemacs}[0]{25} % version of Emacs this is for
 +\newcommand{\versionemacs}[0]{26} % version of Emacs this is for
- \newcommand{\cyear}[0]{2016}       % copyright year
+ \newcommand{\cyear}[0]{2017}       % copyright year
  
  \newcommand\shortcopyrightnotice[0]{\vskip 1ex plus 2 fill
    \centerline{\footnotesize \copyright\ \cyear\ Free Software Foundation, Inc.

diff --cc lisp/ffap.el
Simple merge