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...
emacs-mirror · Jan 17, 2017 · 2b36ae0 · 2b36ae0
2 parents dee6981 + 42614fa
commit 2b36ae0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/etc/refcards/ru-refcard.tex b/etc/refcards/ru-refcard.tex
@@ -41,7 +41,7 @@
 \setlength{\ColThreeWidth}{25mm}
 
 \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 --git a/lisp/ffap.el b/lisp/ffap.el
@@ -171,7 +171,7 @@ this to nil will disable recognition of URLs that are not
 well-formed, such as \"user@host\" or \"<user@host>\"."
   :type 'boolean
   :group 'ffap
-  :version "25.1")
+  :version "25.2")                      ; nil -> t
 
 (defcustom ffap-ftp-default-user "anonymous"
   "User name in FTP file names generated by `ffap-host-to-path'.