diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2017-01-01 01:02:47 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2017-01-01 01:02:47 -0800 |
| commit | 61848d2da32bb889d714fcddcb7dfd6dfa1b502d (patch) | |
| tree | bec14e4a5ad9051ad310273db7fcc1d2164488b7 /lisp/ffap.el | |
| parent | bbb683f04aa0960422b12af5ef79679344fac19c (diff) | |
| parent | 697167b5432a89db009238cf5cbddc61e69ad339 (diff) | |
| download | emacs-61848d2da32bb889d714fcddcb7dfd6dfa1b502d.tar.gz | |
Merge from origin/emacs-25
697167b ; Improve wording of previous change in variables.texi
d7973e8 Document 'default-toplevel-value' and 'set-default-toplevel-v...
8b71826 Don't modify minibuffer variables globally
5b5e036 Revert to pre-25.1 behavior in ffap
19994a1 * lisp/ffap.el: Fix obsolete comment referencing ffap-bug.
3ace730 Attempt to fix 64-bit AIX build
f69bd79 Clarify usage of 'ediff-cleanup-hook' (Bug#24675)
c04ac8a Document that variable binding order is unspecified
272554a * lisp/desktop.el (desktop-buffers-not-to-save): Doc fix.
08de101 Fix M-x hints on Mac port
86a297a Work around reporting a dpi change in apply_xft_settings
cf1f985 ; lisp/skeleton.el (skeleton-insert): Fix typo in last change
9e1209d Amend the version number of CC Mode 5.33 -> 5.32.99. Don't m...
88cdf14 Improve skeleton docstrings
Diffstat (limited to 'lisp/ffap.el')
| -rw-r--r-- | lisp/ffap.el | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/lisp/ffap.el b/lisp/ffap.el index 99bb65faafe..a7983f08395 100644 --- a/lisp/ffap.el +++ b/lisp/ffap.el @@ -32,7 +32,7 @@ ;; (`ffap-require-prefix' swaps these behaviors). This is useful for ;; following references in situations such as mail or news buffers, ;; README's, MANIFEST's, and so on. Submit bugs or suggestions with -;; M-x ffap-bug. +;; M-x report-emacs-bug. ;; ;; For the default installation, add this line to your init file: ;; @@ -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 \"user@host\" or \"<user@host>\"." :type 'boolean :group 'ffap :version "25.1") |