Merge from origin/emacs-24

[gnu-emacs] / lisp / ffap.el

diff --git a/lisp/ffap.el b/lisp/ffap.el
index 95a651bbde6c8feaf19a310acf38d6126a82b6d5..e5f574db2de17a271767c357fdf4761fa50a44a6 100644 (file)
--- a/lisp/ffap.el
+++ b/lisp/ffap.el
@@ -167,7 +167,7 @@ schemes (e.g. \"ftp\"); in that case, only convert those URLs."
   "If non-nil, allow lax URL matching."
   :type 'boolean
   :group 'ffap
-  :version "24.5")
+  :version "25.1")
 
 (defcustom ffap-ftp-default-user "anonymous"
   "User name in FTP file names generated by `ffap-host-to-path'.