[Emacs-diffs] emacs-25 5b5e036: Revert to pre-25.1 behavior in ffap

[Eli Zaretskii]

branch: emacs-25
commit 5b5e03665155c841b775d2d0b97ed16396ffc918
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>

    Revert to pre-25.1 behavior in ffap
    
    * lisp/ffap.el (ffap-lax-url): Change the default to t, to produce
    the same behavior as in Emacs 24.x.  (Bug#25264)
    Explain the trade-offs of customizing this in the doc string.
---
 lisp/ffap.el |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/lisp/ffap.el b/lisp/ffap.el
index c000066..c97c762 100644
--- a/lisp/ffap.el
+++ b/lisp/ffap.el
@@ -162,8 +162,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."
+(defcustom ffap-lax-url t
+  "If non-nil, allow lax URL matching.
+The default non-nil value might produce false URLs in C++ code
+with symbols like \"std::find\".  On the other hand, setting
+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")