Re: [ffap.el] dired-at-point bug

[Juri Linkov <juri@jurta.org>]

Hiroshi Fujishima <pooh@nature.tsukuba.ac.jp> writes:
> M-x ffap-bindings and C-x d ~not-exest causes `Wrong type argument:
> stringp, nil' error, because (file-name-directory "~not-exest") return
> nil though file-writable-p() require string type argument.

The patch below fixes this bug.

BTW, I have another problem with dired-at-point: its prompter deals
with local directories as with regular files.  It's very inconvenient.

For example, ("^" indicates the default point position in the minibuffer):

File: "/dir1/dir2"   Prompt: /dir1/^dir2
File: "/dir1/file"   Prompt: /dir1/^file

I fixed the dired prompter function so that it interprets directories
as a directory and gets a directory component from existing local files:

File: "/dir1/dir2"   Prompt: /dir1/dir2/^
File: "/dir1/file"   Prompt: /dir1/^

Index: emacs/lisp/ffap.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ffap.el,v
retrieving revision 1.43
diff -c -r1.43 ffap.el
*** emacs/lisp/ffap.el	21 Feb 2004 13:41:04 -0000	1.43
--- emacs/lisp/ffap.el	23 Feb 2004 02:59:30 -0000
***************
*** 1,7 ****
! ;; ffap.el --- find file (or url) at point
! ;;
! ;; Copyright (C) 1995, 96, 97, 2000  Free Software Foundation, Inc.
! ;;
  ;; Author: Michelangelo Grigni <mic@mathcs.emory.edu>
  ;; Maintainer: Rajesh Vaidheeswarran  <rv@gnu.org>
  ;; Created: 29 Mar 1993
--- 1,7 ----
! ;;; ffap.el --- find file (or url) at point
! 
! ;; Copyright (C) 1995, 96, 97, 2000, 2004  Free Software Foundation, Inc.
! 
  ;; Author: Michelangelo Grigni <mic@mathcs.emory.edu>
  ;; Maintainer: Rajesh Vaidheeswarran  <rv@gnu.org>
  ;; Created: 29 Mar 1993
***************
*** 1675,1681 ****
        (if (file-directory-p filename)
  	  (dired (expand-file-name filename))
  	(dired (concat (expand-file-name filename) "*"))))
!      ((and (file-writable-p (file-name-directory filename))
             (y-or-n-p "Directory does not exist, create it? "))
        (make-directory filename)
        (dired filename))
--- 1678,1686 ----
        (if (file-directory-p filename)
  	  (dired (expand-file-name filename))
  	(dired (concat (expand-file-name filename) "*"))))
!      ((and (file-writable-p
!             (or (file-name-directory (directory-file-name filename))
!                 filename))
             (y-or-n-p "Directory does not exist, create it? "))
        (make-directory filename)
        (dired filename))
***************
*** 1688,1696 ****
        (ffap-read-file-or-url
         (if ffap-url-regexp "Dired file or URL: " "Dired file: ")
         (prog1
! 	   (setq guess (or guess (ffap-guesser)))
! 	 (and guess (ffap-highlight))
! 	 ))
      (ffap-highlight t)))
  \f
  ;;; Offer default global bindings (`ffap-bindings'):
--- 1693,1716 ----
        (ffap-read-file-or-url
         (if ffap-url-regexp "Dired file or URL: " "Dired file: ")
         (prog1
! 	   (setq guess (or guess
!                            (let ((guess (ffap-guesser)))
!                              (if (or (not guess)
!                                      (ffap-url-p guess)
!                                      (ffap-file-remote-p guess))
!                                  guess
!                                (setq guess (abbreviate-file-name
!                                             (expand-file-name guess)))
!                                (cond
!                                 ;; interpret local directory as directory
!                                 ((file-directory-p guess)
!                                  (file-name-as-directory guess))
!                                 ;; get directory from local file
!                                 ((file-regular-p guess)
!                                  (file-name-directory guess))
!                                 (guess))))
!                            ))
! 	 (and guess (ffap-highlight))))
      (ffap-highlight t)))
  \f
  ;;; Offer default global bindings (`ffap-bindings'):

-- 
http://www.jurta.org/emacs/