[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs/lisp ChangeLog ffap.el
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] emacs/lisp ChangeLog ffap.el |
Date: |
Wed, 09 Sep 2009 02:36:42 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Glenn Morris <gm> 09/09/09 02:36:41
Modified files:
lisp : ChangeLog ffap.el
Log message:
(ffap-file-at-point): Handle absolute (non-remote) files with line
numbers too. (Bug#4374)
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16113&r2=1.16114
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ffap.el?cvsroot=emacs&r1=1.84&r2=1.85
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16113
retrieving revision 1.16114
diff -u -b -r1.16113 -r1.16114
--- ChangeLog 8 Sep 2009 19:47:07 -0000 1.16113
+++ ChangeLog 9 Sep 2009 02:36:38 -0000 1.16114
@@ -1,3 +1,8 @@
+2009-09-09 Glenn Morris <address@hidden>
+
+ * ffap.el (ffap-file-at-point): Handle absolute (non-remote) files with
+ line numbers too. (Bug#4374)
+
2009-09-08 Stefan Monnier <address@hidden>
* smerge-mode.el (smerge-remove-props, smerge-refine):
Index: ffap.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/ffap.el,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -b -r1.84 -r1.85
--- ffap.el 6 Jul 2009 00:50:51 -0000 1.84
+++ ffap.el 9 Sep 2009 02:36:41 -0000 1.85
@@ -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 <address@hidden>
;; Maintainer: FSF
@@ -1177,6 +1177,9 @@
((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))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs/lisp ChangeLog ffap.el,
Glenn Morris <=