Mercurial > emacs
diff lisp/complete.el @ 76655:adb0ab836e5d
(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).
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Wed, 21 Mar 2007 19:23:12 +0000 |
parents | 2a096eef08d4 |
children | 63293afecf15 |
line wrap: on
line diff
--- a/lisp/complete.el Wed Mar 21 16:20:29 2007 +0000 +++ b/lisp/complete.el Wed Mar 21 19:23:12 2007 +0000 @@ -1026,10 +1026,11 @@ (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