# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1174504992 0
# Node ID adb0ab836e5d9c6346d69c56be0946eb26ab26c6
# Parent  f8e66b19be2ca3ec6aa0e3d4c48a39f5fef14b26
(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).

diff -r f8e66b19be2c -r adb0ab836e5d lisp/ChangeLog
--- a/lisp/ChangeLog	Wed Mar 21 16:20:29 2007 +0000
+++ b/lisp/ChangeLog	Wed Mar 21 19:23:12 2007 +0000
@@ -1,3 +1,9 @@
+2007-03-21  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* complete.el (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).
+
 2007-03-21  Chong Yidong  <cyd@stupidchicken.com>
 
 	* emulation/viper.el (viper-non-hook-settings): Handle mouse
diff -r f8e66b19be2c -r adb0ab836e5d lisp/complete.el
--- 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