mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-03-06 22:12:30 -08:00
(ffap-file-at-point): Handle absolute (non-remote) files with line
numbers too. (Bug#4374)
This commit is contained in:
parent
07cd41530f
commit
2b2eb43148
2 changed files with 10 additions and 2 deletions
|
|
@ -1,3 +1,8 @@
|
|||
2009-09-09 Glenn Morris <rgm@gnu.org>
|
||||
|
||||
* ffap.el (ffap-file-at-point): Handle absolute (non-remote) files with
|
||||
line numbers too. (Bug#4374)
|
||||
|
||||
2009-09-08 Stefan Monnier <monnier@iro.umontreal.ca>
|
||||
|
||||
* smerge-mode.el (smerge-remove-props, smerge-refine):
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
;;; ffap.el --- find file (or url) at point
|
||||
|
||||
;; Copyright (C) 1995, 1996, 1997, 2000, 2001, 2002, 2003, 2004,
|
||||
;; 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
|
||||
;; Copyright (C) 1995, 1996, 1997, 2000, 2001, 2002, 2003, 2004, 2005,
|
||||
;; 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
|
||||
|
||||
;; Author: Michelangelo Grigni <mic@mathcs.emory.edu>
|
||||
;; Maintainer: FSF
|
||||
|
|
@ -1177,6 +1177,9 @@ which may actually result in an url rather than a filename."
|
|||
((and abs (ffap-file-remote-p name)))
|
||||
;; Ok, not remote, try the existence test even if it is absolute:
|
||||
((and abs (ffap-file-exists-string name)))
|
||||
;; Try stripping off line numbers.
|
||||
((and abs (string-match ":[0-9]" name)
|
||||
(ffap-file-exists-string (substring name 0 (match-beginning 0)))))
|
||||
;; If it contains a colon, get rid of it (and return if exists)
|
||||
((and (string-match path-separator name)
|
||||
(setq name (ffap-string-at-point 'nocolon))
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue