[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 2b36ae0 2/2: Merge from origin/emacs-25
From: |
Paul Eggert |
Subject: |
[Emacs-diffs] master 2b36ae0 2/2: Merge from origin/emacs-25 |
Date: |
Tue, 17 Jan 2017 15:35:21 +0000 (UTC) |
branch: master
commit 2b36ae07e3c8106e4603b330fc470f0595d28de0
Merge: dee6981 42614fa
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>
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...
---
etc/refcards/ru-refcard.tex | 2 +-
lisp/ffap.el | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/etc/refcards/ru-refcard.tex b/etc/refcards/ru-refcard.tex
index c961f7a..fad75dd 100644
--- 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
index 068897b..d7222bf 100644
--- 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 \"address@hidden" or \"<address@hidden>\"."
: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'.