[Emacs-diffs] Changes to emacs/lisp/ffap.el

[Juri Linkov]

Index: emacs/lisp/ffap.el
diff -c emacs/lisp/ffap.el:1.47 emacs/lisp/ffap.el:1.48
*** emacs/lisp/ffap.el:1.47     Mon Dec 27 15:41:08 2004
--- emacs/lisp/ffap.el  Thu Apr  7 15:42:24 2005
***************
*** 217,226 ****
    "*A regexp matching filename wildcard characters, or nil.
  
  If `find-file-at-point' gets a filename matching this pattern,
! it passes it on to `find-file' with non-nil WILDCARDS argument,
! which expands wildcards and visits multiple files.  To visit
! a file whose name contains wildcard characters you can suppress
! wildcard expansion by setting `find-file-wildcards'.
  
  If `dired-at-point' gets a filename matching this pattern,
  it passes it on to `dired'."
--- 217,229 ----
    "*A regexp matching filename wildcard characters, or nil.
  
  If `find-file-at-point' gets a filename matching this pattern,
! and `ffap-pass-wildcards-to-dired' is nil, it passes it on to
! `find-file' with non-nil WILDCARDS argument, which expands
! wildcards and visits multiple files.  To visit a file whose name
! contains wildcard characters you can suppress wildcard expansion
! by setting `find-file-wildcards'.  If `find-file-at-point' gets a
! filename matching this pattern and `ffap-pass-wildcards-to-dired'
! is non-nil, it passes it on to `dired'.
  
  If `dired-at-point' gets a filename matching this pattern,
  it passes it on to `dired'."
***************
*** 230,235 ****
--- 233,243 ----
                 )
    :group 'ffap)
  
+ (defcustom ffap-pass-wildcards-to-dired nil
+   "*If non-nil, pass filenames matching `ffap-dired-wildcards' to dired."
+   :type 'boolean
+   :group 'ffap)
+ 
  (defcustom ffap-newfile-prompt nil
    ;; Suggestion from RHOGEE, 11 Jul 1994.  Disabled, I think this is
    ;; better handled by `find-file-not-found-hooks'.
***************
*** 1386,1391 ****
--- 1394,1403 ----
       ((ffap-url-p filename)
        (let (current-prefix-arg)               ; w3 2.3.25 bug, reported by KPC
        (funcall ffap-url-fetcher filename)))
+      ((and ffap-pass-wildcards-to-dired
+          ffap-dired-wildcards
+          (string-match ffap-dired-wildcards filename))
+       (funcall ffap-directory-finder filename))
       ((and ffap-dired-wildcards
           (string-match ffap-dired-wildcards filename)
           find-file-wildcards