(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 --git a/lisp/ChangeLog b/lisp/ChangeLog
index e24c331ab225100d067dd1fd6d5c2aed1696698d..052c64bc5c34be79261bdecf23f5df6a4dd2adef 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 --git a/lisp/complete.el b/lisp/complete.el
index ce5094d1aef73e9608974aa041b5e937b4871065..e86d71c16be3821f7f4c0ab02a2e5cad41612101 100644 (file)
--- 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