Permalink
Browse files

updated for version 7.3.750

Problem:    The justify macro does not always work correctly.
Solution:   Fix off-by-one error (James McCoy)
  • Loading branch information...
1 parent fa4157d commit 0b0b4a483579a2b1901b87f203647e4c45aa4da2 @brammool brammool committed Dec 5, 2012
Showing with 6 additions and 5 deletions.
  1. +4 −5 runtime/macros/justify.vim
  2. +2 −0 src/version.c
View
9 runtime/macros/justify.vim
@@ -1,4 +1,4 @@
-" Function to left and rigt align text.
+" Function to left and right align text.
"
" Written by: Preben "Peppe" Guldberg <c928400@student.dtu.dk>
" Created: 980806 14:13 (or around that time anyway)
@@ -256,18 +256,17 @@ function! Justify(...) range
let str = substitute(str, '\s\+$', '', '')
let str = substitute(str, '^\s\+', '', '')
let str = substitute(str, '\s\+', ' ', 'g')
- " Use substitute() hack to get strlen in characters instead of bytes
- let str_n = strlen(substitute(str, '.', 'x', 'g'))
+ let str_n = strdisplaywidth(str)
" Possible addition of space after punctuation
if exists("join_str")
let str = substitute(str, join_str, '\1 ', 'g')
endif
- let join_n = strlen(substitute(str, '.', 'x', 'g')) - str_n
+ let join_n = strdisplaywidth(str) - str_n
" Can extraspaces be added?
" Note that str_n may be less than strlen(str) [joinspaces above]
- if strlen(substitute(str, '.', 'x', 'g')) < tw - indent_n && str_n > 0
+ if strdisplaywidth(str) <= tw - indent_n && str_n > 0
" How many spaces should be added
let s_add = tw - str_n - indent_n - join_n
let s_nr = strlen(substitute(str, '\S', '', 'g') ) - join_n
View
2 src/version.c
@@ -726,6 +726,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 750,
+/**/
749,
/**/
748,

0 comments on commit 0b0b4a4

Please sign in to comment.