From: Paul Eggert <eggert@cs.ucla.edu>
Date: Tue, 17 Jan 2017 15:34:25 +0000 (-0800)
Subject: Merge from origin/emacs-25
X-Git-Tag: emacs-26.0.90~870^2~104
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2b36ae07e3c8106e4603b330fc470f0595d28de0;p=emacs.git

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

2b36ae07e3c8106e4603b330fc470f0595d28de0
diff --cc etc/refcards/ru-refcard.tex
index c961f7a2a02,700a2096a56..fad75ddda47
--- a/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.