diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2007-03-21 19:23:12 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2007-03-21 19:23:12 +0000 |
| commit | 414a17c9a5fabe70cacfd2c25925dcb09f838dff (patch) | |
| tree | c16aef44ccbcc54233bdd0e5bbabd536fe934a13 /lisp/complete.el | |
| parent | 255523e9355961d457a1cb51a8e1e00b9904abb1 (diff) | |
| download | emacs-414a17c9a5fabe70cacfd2c25925dcb09f838dff.tar.gz | |
(read-file-name-internal): Don't add the final > if the completion is not
finished (re-application of this patch, which was accidentally undone by Eli).
Diffstat (limited to 'lisp/complete.el')
| -rw-r--r-- | lisp/complete.el | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/complete.el b/lisp/complete.el index ce5094d1aef..e86d71c16be 100644 --- a/lisp/complete.el +++ b/lisp/complete.el @@ -1026,10 +1026,11 @@ absolute rather than relative to some directory on the SEARCH-PATH." (if (string-match "<\\([^\"<>]*\\)>?\\'" (ad-get-arg 0)) (let* ((string (ad-get-arg 0)) (action (ad-get-arg 2)) - (name (substring string (match-beginning 1) (match-end 1))) + (name (match-string 1 string)) (str2 (substring string (match-beginning 0))) (completion-table - (mapcar (lambda (x) (format "<%s>" x)) + (mapcar (lambda (x) + (format (if (string-match "/\\'" x) "<%s" "<%s>") x)) (PC-include-file-all-completions name (PC-include-file-path))))) (setq ad-return-value |