diff options
| author | Paul Eggert | 2017-01-17 07:34:25 -0800 |
|---|---|---|
| committer | Paul Eggert | 2017-01-17 07:34:25 -0800 |
| commit | 2b36ae07e3c8106e4603b330fc470f0595d28de0 (patch) | |
| tree | f6de503d5995ef4eea4fd9099bf9ea4502b76ff8 /lisp | |
| parent | dee6981c8de6347ef66a9a1c37d65c43a9a8c4a6 (diff) | |
| parent | 42614fafa273f9a692c42c4dd1220e0db49e7a4c (diff) | |
| download | emacs-2b36ae07e3c8106e4603b330fc470f0595d28de0.tar.gz emacs-2b36ae07e3c8106e4603b330fc470f0595d28de0.zip | |
Merge from origin/emacs-25
42614fa Update remaining copyright years with admin.el M-x set-copyright
f17a006 * lisp/ffap.el (ffap-lax-url): Bump :version after recent cha...
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ffap.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/ffap.el b/lisp/ffap.el index 068897b21b8..d7222bfb681 100644 --- a/lisp/ffap.el +++ b/lisp/ffap.el | |||
| @@ -171,7 +171,7 @@ this to nil will disable recognition of URLs that are not | |||
| 171 | well-formed, such as \"user@host\" or \"<user@host>\"." | 171 | well-formed, such as \"user@host\" or \"<user@host>\"." |
| 172 | :type 'boolean | 172 | :type 'boolean |
| 173 | :group 'ffap | 173 | :group 'ffap |
| 174 | :version "25.1") | 174 | :version "25.2") ; nil -> t |
| 175 | 175 | ||
| 176 | (defcustom ffap-ftp-default-user "anonymous" | 176 | (defcustom ffap-ftp-default-user "anonymous" |
| 177 | "User name in FTP file names generated by `ffap-host-to-path'. | 177 | "User name in FTP file names generated by `ffap-host-to-path'. |