From: Dmitry Gutov <dgutov@yandex.ru>
Date: Wed, 8 Apr 2015 00:18:38 +0000 (+0300)
Subject: ffap: Support environment variable expansion in file names
X-Git-Tag: emacs-25.0.90~2536^2~1
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ba6c32b6decaa2a72a3d5f854efd513e8e82c118;p=emacs.git

ffap: Support environment variable expansion in file names

Fixes: debbugs:19839

* lisp/ffap.el (ffap-string-at-point-mode-alist): Support
environment variable expansion in file names.
---

diff --git a/lisp/ffap.el b/lisp/ffap.el
index d4e30a05dcc..452275ab8c2 100644
--- a/lisp/ffap.el
+++ b/lisp/ffap.el
@@ -1004,7 +1004,7 @@ If a given RFC isn't in these then `ffap-rfc-path' is offered."
     ;; Slightly controversial decisions:
     ;; * strip trailing "@" and ":"
     ;; * no commas (good for latex)
-    (file "--:\\\\$+<>@-Z_[:alpha:]~*?" "<@" "@>;.,!:")
+    (file "--:\\\\$\\{\\}+<>@-Z_[:alpha:]~*?" "<@" "@>;.,!:")
     ;; An url, or maybe a email/news message-id:
     (url "--:=&?$+@-Z_[:alpha:]~#,%;*()!'" "^[0-9a-zA-Z]" ":;.,!?")
     ;; Find a string that does *not* contain a colon: