[Emacs-diffs] trunk r116627: lisp/icomplete.el (icomplete-completions): Use string-width.

[Juanma Barranquero]

------------------------------------------------------------
revno: 116627
revision-id: address@hidden
parent: address@hidden
committer: Juanma Barranquero <address@hidden>
branch nick: trunk
timestamp: Sun 2014-03-02 01:50:07 +0100
message:
  lisp/icomplete.el (icomplete-completions): Use string-width.
  Suggested by Stefan Monier <address@hidden>.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/icomplete.el              
icomplete.el-20091113204419-o5vbwnq5f7feedwu-643

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-03-01 22:04:59 +0000
+++ b/lisp/ChangeLog    2014-03-02 00:50:07 +0000
@@ -1,3 +1,8 @@
+2014-03-02  Juanma Barranquero  <address@hidden>
+
+       * icomplete.el (icomplete-completions): Use string-width.
+       Suggested by Stefan Monier <address@hidden>.
+
 2014-03-01  Dmitry Gutov  <address@hidden>
 
        * progmodes/ruby-mode.el (ruby-font-lock-keywords): Highlight

=== modified file 'lisp/icomplete.el'
--- a/lisp/icomplete.el 2014-03-01 01:25:29 +0000
+++ b/lisp/icomplete.el 2014-03-02 00:50:07 +0000
@@ -403,14 +403,14 @@
                                 (substring most compare))
                                 ;; Don't bother truncating if it doesn't gain
                                 ;; us at least 2 columns.
-                               ((< compare (+ 2 (length ellipsis))) most)
+                               ((< compare (+ 2 (string-width ellipsis))) most)
                                (t (concat ellipsis (substring most compare))))
                               close-bracket)))
             ;;"-prospects" - more than one candidate
             (prospects-len (+ (string-width
                                (or determ (concat open-bracket close-bracket)))
                               (string-width icomplete-separator)
-                              (+ 2 (length ellipsis)) ;; take {…} into account
+                              (+ 2 (string-width ellipsis)) ;; take {…} into 
account
                               (string-width (buffer-string))))
              (prospects-max
               ;; Max total length to use, including the minibuffer content.