Commit 7c35a922 authored by Ivan Andrus's avatar Ivan Andrus Committed by Stefan Monnier

* lisp/ffap.el (ffap-lax-url): New var.

(ffap-url-at-point): Use it.
(ffap-file-at-point): Avoid returning just "/".

Fixes: debbugs:17723
parent 82fb2a08
2014-06-12 Ivan Andrus <darthandrus@gmail.com>
* ffap.el (ffap-lax-url): New var (bug#17723).
(ffap-url-at-point): Use it.
(ffap-file-at-point): Avoid returning just "/".
2014-06-12 Matthias Meulien <orontee@gmail.com>
* progmodes/python.el (class skeleton): Don't erase last char of class
......
......@@ -163,6 +163,12 @@ schemes (e.g. \"ftp\"); in that case, only convert those URLs."
:group 'ffap
:version "24.3")
(defcustom ffap-lax-url nil
"If non-nil, allow lax URL matching."
:type 'boolean
:group 'ffap
:version "24.5")
(defcustom ffap-ftp-default-user "anonymous"
"User name in FTP file names generated by `ffap-host-to-path'.
Note this name may be omitted if it equals the default
......@@ -1096,7 +1102,7 @@ Assumes the buffer has not changed."
(w3-view-this-url t))
(let ((thing-at-point-beginning-of-url-regexp ffap-url-regexp)
(thing-at-point-default-mail-uri-scheme ffap-foo-at-bar-prefix))
(thing-at-point-url-at-point t
(thing-at-point-url-at-point ffap-lax-url
(if (use-region-p)
(cons (region-beginning)
(region-end))))))))
......@@ -1253,7 +1259,8 @@ which may actually result in an URL rather than a filename."
(not (ffap-file-exists-string dir))
(not (equal dir (setq dir (file-name-directory
(directory-file-name dir)))))))
(ffap-file-exists-string dir)))
(and (not (string= dir "/"))
(ffap-file-exists-string dir))))
)
(set-match-data data))))
......
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