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

[Kim F . Storm]

Index: emacs/lisp/ido.el
diff -c emacs/lisp/ido.el:1.65 emacs/lisp/ido.el:1.66
*** emacs/lisp/ido.el:1.65      Fri Jul  8 09:44:47 2005
--- emacs/lisp/ido.el   Fri Jul  8 10:07:39 2005
***************
*** 578,585 ****
  
  (defcustom ido-use-filename-at-point nil
    "*Non-nil means that ido shall look for a filename at point.
  If found, use that as the starting point for filename selection."
!   :type 'boolean
    :group 'ido)
  
  
--- 578,589 ----
  
  (defcustom ido-use-filename-at-point nil
    "*Non-nil means that ido shall look for a filename at point.
+ May use `ffap-guesser' to guess whether text at point is a filename.
  If found, use that as the starting point for filename selection."
!   :type '(choice
!         (const :tag "Disabled" nil)
!         (const :tag "Guess filename" guess)
!         (other :tag "Use literal filename" t))
    :group 'ido)
  
  
***************
*** 2051,2057 ****
                filename t))
  
         ((and ido-use-filename-at-point
!              (setq fn (ffap-string-at-point))
               (not (string-match "^http:/" fn))
               (setq d (file-name-directory fn))
               (file-directory-p d))
--- 2055,2063 ----
                filename t))
  
         ((and ido-use-filename-at-point
!              (setq fn (if (eq ido-use-filename-at-point 'guess)
!                           (ffap-guesser)
!                         (ffap-string-at-point)))
               (not (string-match "^http:/" fn))
               (setq d (file-name-directory fn))
               (file-directory-p d))