[Emacs-diffs] trunk r117318: * lisp/ffap.el (ffap-lax-url): New var.

[Stefan Monnier]

------------------------------------------------------------
revno: 117318
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=17723
author: Ivan Andrus <address@hidden>
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Wed 2014-06-11 22:29:50 -0400
message:
  * lisp/ffap.el (ffap-lax-url): New var.
  (ffap-url-at-point): Use it.
  (ffap-file-at-point): Avoid returning just "/".
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/ffap.el                   ffap.el-20091113204419-o5vbwnq5f7feedwu-953

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-06-12 02:24:24 +0000
+++ b/lisp/ChangeLog    2014-06-12 02:29:50 +0000
@@ -1,3 +1,9 @@
+2014-06-12  Ivan Andrus  <address@hidden>
+
+       * 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  <address@hidden>
 
        * progmodes/python.el (class skeleton): Don't erase last char of class

=== modified file 'lisp/ffap.el'
--- a/lisp/ffap.el      2014-03-21 01:12:57 +0000
+++ b/lisp/ffap.el      2014-06-12 02:29:50 +0000
@@ -163,6 +163,12 @@
   :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 @@
             (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 @@
                         (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))))