auto upstream

2 files changed, 8 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 464ff7e084a..9d05f2fcc26 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2012-12-17  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * icomplete.el (icomplete-completions): Also use … to truncate prefix.
+
 2012-12-17  Kevin Ryde  <user42@zip.com.au>
 
         * files.el (auto-save-file-name-p): Use \` and \' (bug#13186).
diff --git a/lisp/icomplete.el b/lisp/icomplete.el
index 08d8c28816f..5882accad85 100644
--- a/lisp/icomplete.el
+++ b/lisp/icomplete.el
@@ -337,8 +337,10 @@ are exhibited within the square braces.)"
                                 ((= compare (length name))
                                  ;; Typical case: name is a prefix.
                                  (substring most compare))
-                                ((< compare 5) most)
-                                (t (concat "..." (substring most compare))))
+                                ;; Don't bother truncating if it doesn't gain
+                                ;; us at least 2 columns.
+                                ((< compare 3) most)
+                                (t (concat "…" (substring most compare))))
                                close-bracket)))
              ;;"-prospects" - more than one candidate
              (prospects-len (+ (length determ) 6 ;; take {,...} into account