Commit 2b36ae07 authored by Paul Eggert's avatar Paul Eggert
Browse files

Merge from origin/emacs-25

42614faf Update remaining copyright years with admin.el M-x set-copyright
f17a0069 * lisp/ffap.el (ffap-lax-url): Bump :version after recent cha...
parents dee6981c 42614faf
......@@ -41,7 +41,7 @@
\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.
......@@ -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'.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment