diff options
| author | Thierry Volpiatto <thierry.volpiatto@gmail.com> | 2017-07-12 16:54:48 +0200 |
|---|---|---|
| committer | Thierry Volpiatto <thierry.volpiatto@gmail.com> | 2017-07-12 16:54:48 +0200 |
| commit | d0cf55bf475c2cbbd315761f73c6bb7ece5a63fc (patch) | |
| tree | 4c7bab978d4b7ef425c3c88eb01e89633ad6228a /helm-utils.el | |
| parent | 7614adec80b0863c9f5ec8ea0cb11aa89a7ca413 (diff) | |
Fix and use helm--url-regexp instead of ffap-url-regexp (#1817)
* helm-files.el (helm-find-files-eshell-command-on-file-1): Do it.
(helm-substitute-in-filename): Do it.
(helm-point-file-in-dired): Do it.
(helm-marked-files-in-dired): Do it.
(helm-find-files-get-candidates): Do it.
(helm-ff-prefix-filename): Do it.
(helm-ff-filter-candidate-one-by-one): Do it.
(helm-find-files-action-transformer): Do it.
(helm-ffap-guesser): Do it.
(helm-find-files-input): Do it.
(helm-ff-find-url-at-point): Do it.
(helm-find-file-or-marked): Do it.
(helm-highlight-files): Do it.
* helm-mode.el (helm-comp-read-get-candidates): Do it.
* helm-utils.el (helm-quit-and-find-file): Do it.
* helm.el (helm--url-regexp): Make it match at beginning of string.
Diffstat (limited to 'helm-utils.el')
| -rw-r--r-- | helm-utils.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/helm-utils.el b/helm-utils.el index 3c6b1dcc..39e49e92 100644 --- a/helm-utils.el +++ b/helm-utils.el @@ -377,8 +377,8 @@ from its directory." default-preselection)) ;; Bookmark. (bmk (helm-aif (bookmark-get-filename bmk) - (if (and ffap-url-regexp - (string-match ffap-url-regexp it)) + (if (and helm--url-regexp + (string-match helm--url-regexp it)) it (expand-file-name it)) (expand-file-name default-directory))) ((and (stringp sel) (or (file-remote-p sel) @@ -392,7 +392,7 @@ from its directory." (with-current-buffer (get-buffer (car grep-line)) (expand-file-name (or (buffer-file-name) default-directory)))) ;; Url. - ((and (stringp sel) ffap-url-regexp (string-match ffap-url-regexp sel)) sel) + ((and (stringp sel) helm--url-regexp (string-match helm--url-regexp sel)) sel) ;; Default. (t (expand-file-name default-preselection))))))) (put 'helm-quit-and-find-file 'helm-only t) |