From 7f6f1723a27fe3948ea7d2bb8465e3bf28f63f56 Mon Sep 17 00:00:00 2001
From: Matt Wozniski <godlygeek@gmail.com>
Date: Sun, 21 Oct 2012 22:37:02 -0400
Subject: [PATCH] Use strdisplaywidth where available

In vim 7.3, the strdisplaywidth function was added to give an accurate
count of the number of screen columns that will be taken up by a given
string.  Tabular was written before vim 7.3, and was implementing this
functionality itself (at least for tabs; it wasn't trying to handle
doublewide characters).

This changeset allows us to take advantage of strdisplaywidth where it
exists.
---
 autoload/tabular.vim | 36 ++++++++++++++++++++++--------------
 1 file changed, 22 insertions(+), 14 deletions(-)

diff --git a/autoload/tabular.vim b/autoload/tabular.vim
index 385f41d..f60a73c 100644
--- a/autoload/tabular.vim
+++ b/autoload/tabular.vim
@@ -46,22 +46,30 @@ set cpo&vim
 
 " Return the number of bytes in a string after expanding tabs to spaces.  {{{2
 " This expansion is done based on the current value of 'tabstop'
-function! s:Strlen(string)
-  let rv = 0
-  let i = 0
+if exists('*strdisplaywidth')
+  " Needs vim 7.3
+  let s:Strlen = function("strdisplaywidth")
+else
+  function! s:Strlen(string)
+    " Implement the tab handling part of strdisplaywidth for vim 7.2 and
+    " earlier - not much that can be done about handling doublewidth
+    " characters.
+    let rv = 0
+    let i = 0
 
-  for char in split(a:string, '\zs')
-    if char == "\t"
-      let rv += &ts - i
-      let i = 0
-    else
-      let rv += 1
-      let i = (i + 1) % &ts
-    endif
-  endfor
+    for char in split(a:string, '\zs')
+      if char == "\t"
+        let rv += &ts - i
+        let i = 0
+      else
+        let rv += 1
+        let i = (i + 1) % &ts
+      endif
+    endfor
 
-  return rv
-endfunction
+    return rv
+  endfunction
+endif
 
 " Align a string within a field                                           {{{2
 " These functions do not trim leading and trailing spaces.