Mercurial > emacs
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 76654:f8e66b19be2c | 76655:adb0ab836e5d |
|---|---|
| 1024 | 1024 |
| 1025 (defadvice read-file-name-internal (around PC-include-file disable) | 1025 (defadvice read-file-name-internal (around PC-include-file disable) |
| 1026 (if (string-match "<\\([^\"<>]*\\)>?\\'" (ad-get-arg 0)) | 1026 (if (string-match "<\\([^\"<>]*\\)>?\\'" (ad-get-arg 0)) |
| 1027 (let* ((string (ad-get-arg 0)) | 1027 (let* ((string (ad-get-arg 0)) |
| 1028 (action (ad-get-arg 2)) | 1028 (action (ad-get-arg 2)) |
| 1029 (name (substring string (match-beginning 1) (match-end 1))) | 1029 (name (match-string 1 string)) |
| 1030 (str2 (substring string (match-beginning 0))) | 1030 (str2 (substring string (match-beginning 0))) |
| 1031 (completion-table | 1031 (completion-table |
| 1032 (mapcar (lambda (x) (format "<%s>" x)) | 1032 (mapcar (lambda (x) |
| 1033 (format (if (string-match "/\\'" x) "<%s" "<%s>") x)) | |
| 1033 (PC-include-file-all-completions | 1034 (PC-include-file-all-completions |
| 1034 name (PC-include-file-path))))) | 1035 name (PC-include-file-path))))) |
| 1035 (setq ad-return-value | 1036 (setq ad-return-value |
| 1036 (cond | 1037 (cond |
| 1037 ((not completion-table) nil) | 1038 ((not completion-table) nil) |