Mercurial > emacs
comparison lisp/ffap.el @ 90140:02f1dbc4a199
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-35
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 228-240)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 53-58)
- Merge from emacs--cvs-trunk--0
- Update from CVS
- Collapse feature addition/removal within single ChangeLog entry
author | Miles Bader <miles@gnu.org> |
---|---|
date | Sat, 09 Apr 2005 02:16:29 +0000 |
parents | 95879cc1ed20 e59db0620294 |
children | f9a65d7ebd29 |
comparison
equal
deleted
inserted
replaced
90139:e0d294b9b23e | 90140:02f1dbc4a199 |
---|---|
215 | 215 |
216 (defcustom ffap-dired-wildcards "[*?][^/]*\\'" | 216 (defcustom ffap-dired-wildcards "[*?][^/]*\\'" |
217 "*A regexp matching filename wildcard characters, or nil. | 217 "*A regexp matching filename wildcard characters, or nil. |
218 | 218 |
219 If `find-file-at-point' gets a filename matching this pattern, | 219 If `find-file-at-point' gets a filename matching this pattern, |
220 it passes it on to `find-file' with non-nil WILDCARDS argument, | 220 and `ffap-pass-wildcards-to-dired' is nil, it passes it on to |
221 which expands wildcards and visits multiple files. To visit | 221 `find-file' with non-nil WILDCARDS argument, which expands |
222 a file whose name contains wildcard characters you can suppress | 222 wildcards and visits multiple files. To visit a file whose name |
223 wildcard expansion by setting `find-file-wildcards'. | 223 contains wildcard characters you can suppress wildcard expansion |
224 by setting `find-file-wildcards'. If `find-file-at-point' gets a | |
225 filename matching this pattern and `ffap-pass-wildcards-to-dired' | |
226 is non-nil, it passes it on to `dired'. | |
224 | 227 |
225 If `dired-at-point' gets a filename matching this pattern, | 228 If `dired-at-point' gets a filename matching this pattern, |
226 it passes it on to `dired'." | 229 it passes it on to `dired'." |
227 :type '(choice (const :tag "Disable" nil) | 230 :type '(choice (const :tag "Disable" nil) |
228 (const :tag "Enable" "[*?][^/]*\\'") | 231 (const :tag "Enable" "[*?][^/]*\\'") |
229 ;; regexp -- probably not useful | 232 ;; regexp -- probably not useful |
230 ) | 233 ) |
234 :group 'ffap) | |
235 | |
236 (defcustom ffap-pass-wildcards-to-dired nil | |
237 "*If non-nil, pass filenames matching `ffap-dired-wildcards' to dired." | |
238 :type 'boolean | |
231 :group 'ffap) | 239 :group 'ffap) |
232 | 240 |
233 (defcustom ffap-newfile-prompt nil | 241 (defcustom ffap-newfile-prompt nil |
234 ;; Suggestion from RHOGEE, 11 Jul 1994. Disabled, I think this is | 242 ;; Suggestion from RHOGEE, 11 Jul 1994. Disabled, I think this is |
235 ;; better handled by `find-file-not-found-hooks'. | 243 ;; better handled by `find-file-not-found-hooks'. |
1384 (or filename (setq filename (ffap-prompter))) | 1392 (or filename (setq filename (ffap-prompter))) |
1385 (cond | 1393 (cond |
1386 ((ffap-url-p filename) | 1394 ((ffap-url-p filename) |
1387 (let (current-prefix-arg) ; w3 2.3.25 bug, reported by KPC | 1395 (let (current-prefix-arg) ; w3 2.3.25 bug, reported by KPC |
1388 (funcall ffap-url-fetcher filename))) | 1396 (funcall ffap-url-fetcher filename))) |
1397 ((and ffap-pass-wildcards-to-dired | |
1398 ffap-dired-wildcards | |
1399 (string-match ffap-dired-wildcards filename)) | |
1400 (funcall ffap-directory-finder filename)) | |
1389 ((and ffap-dired-wildcards | 1401 ((and ffap-dired-wildcards |
1390 (string-match ffap-dired-wildcards filename) | 1402 (string-match ffap-dired-wildcards filename) |
1391 find-file-wildcards | 1403 find-file-wildcards |
1392 ;; Check if it's find-file that supports wildcards arg | 1404 ;; Check if it's find-file that supports wildcards arg |
1393 (memq ffap-file-finder '(find-file find-alternate-file))) | 1405 (memq ffap-file-finder '(find-file find-alternate-file))) |