aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiles Bader2002-03-11 04:15:31 +0000
committerMiles Bader2002-03-11 04:15:31 +0000
commit8a5782b5da0b1305734714b37ed8d6e4c6ac41f0 (patch)
treecadeb445baa4dee95332f0a329079272efcc8a4c
parenta0db0bbfdbaf94302db1ae8e686b6e312855ee10 (diff)
downloademacs-8a5782b5da0b1305734714b37ed8d6e4c6ac41f0.tar.gz
emacs-8a5782b5da0b1305734714b37ed8d6e4c6ac41f0.zip
(pcomplete-entries): Expand environment variables in filename.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/pcomplete.el4
2 files changed, 7 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 343b629d72d..600dbcd1957 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12002-03-07 Miles Bader <miles@gnu.org>
2
3 * pcomplete.el (pcomplete-entries): Expand environment variables
4 in filename.
5
12002-03-10 Daniel Pfeiffer <occitan@esperanto.org> 62002-03-10 Daniel Pfeiffer <occitan@esperanto.org>
2 7
3 * play/mpuz.el: Use defface instead of facemenu-get-face. 8 * play/mpuz.el: Use defface instead of facemenu-get-face.
diff --git a/lisp/pcomplete.el b/lisp/pcomplete.el
index 521471a1da1..9b944ce4cf2 100644
--- a/lisp/pcomplete.el
+++ b/lisp/pcomplete.el
@@ -1,6 +1,6 @@
1;;; pcomplete.el --- programmable completion 1;;; pcomplete.el --- programmable completion
2 2
3;; Copyright (C) 1999, 2000, 2001 Free Sofware Foundation 3;; Copyright (C) 1999, 2000, 2001, 2002 Free Sofware Foundation
4 4
5;; Author: John Wiegley <johnw@gnu.org> 5;; Author: John Wiegley <johnw@gnu.org>
6;; Keywords: processes abbrev 6;; Keywords: processes abbrev
@@ -703,7 +703,7 @@ If PREDICATE is non-nil, it will also be used to refine the match
703\(files for which the PREDICATE returns nil will be excluded). 703\(files for which the PREDICATE returns nil will be excluded).
704If PATH is non-nil, it will be used for completion instead of 704If PATH is non-nil, it will be used for completion instead of
705consulting the last argument." 705consulting the last argument."
706 (let* ((name pcomplete-stub) 706 (let* ((name (substitute-env-vars pcomplete-stub))
707 (default-directory (expand-file-name 707 (default-directory (expand-file-name
708 (or (file-name-directory name) 708 (or (file-name-directory name)
709 default-directory))) 709 default-directory)))