procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge from origin/emacs-25

Browse source 
42614fa Update remaining copyright years with admin.el M-x set-copyright
f17a006 * lisp/ffap.el (ffap-lax-url): Bump :version after recent cha...
This commit is contained in:
Paul Eggert 2017-01-17 07:34:25 -08:00
commit 2b36ae07e3
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
etc/refcards/ru-refcard.tex
View file

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

2
lisp/ffap.el
View file

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