diff --git a/autoload/DrawIt.vim b/autoload/DrawIt.vim
index cc941f0..b36583f 100644
--- a/autoload/DrawIt.vim
+++ b/autoload/DrawIt.vim
@@ -3,8 +3,8 @@
 " Maintainer:	Charles E. Campbell, Jr.
 " Authors:	Charles E. Campbell, Jr. <NdrOchipS@PcampbellAfamily.Mbiz> - NOSPAM
 "   		Sylvain Viart (molo@multimania.com)
-" Version:	10
-" Date:		Jun 12, 2008
+" Version:	11k	ASTRO-ONLY
+" Date:		Feb 22, 2011
 "
 " Quick Setup: {{{1
 "              tar -oxvf DrawIt.tar
@@ -18,7 +18,7 @@
 "             You may also use visual-block mode to select endpoints and
 "             draw lines, arrows, and ellipses.
 "
-" Copyright:    Copyright (C) 1999-2005 Charles E. Campbell, Jr. {{{1
+" Copyright:    Copyright (C) 1999-2010 Charles E. Campbell, Jr. {{{1
 "               Permission is hereby granted to use and distribute this code,
 "               with or without modifications, provided that this copyright
 "               notice is copied with it. Like anything else that's free,
@@ -41,15 +41,29 @@
 if &cp || exists("g:loaded_DrawIt")
  finish
 endif
+let g:loaded_DrawIt= "v11k"
+if v:version < 700
+ echohl WarningMsg
+ echo "***warning*** this version of DrawIt needs vim 7.0"
+ echohl Normal
+ finish
+endif
 let s:keepcpo= &cpo
 set cpo&vim
 
+if !exists("g:drawit_xstrlen")
+ if &enc == "latin1" || $LANG == "en_US.UTF-8" || !has("multi_byte")
+  let g:drawit_xstrlen= 0
+ else
+  let g:drawit_xstrlen= 1
+ endif
+endif
+
 " ---------------------------------------------------------------------
 "  Script Variables: {{{1
 if !exists("s:saveposn_count")
  let s:saveposn_count= 0
 endif
-let g:loaded_DrawIt= "v10"
 "DechoTabOn
 
 " =====================================================================
@@ -80,6 +94,16 @@ fun! DrawIt#StartDrawIt()
   endif
   setlocal mouse=a
 
+  " StartDrawIt: set up type of strlen() calculation that's needed {{{3
+  if !exists("g:drawit_xstrlen")
+   if exists("g:Align_xstrlen")
+    let g:drawit_xstrlen= g:Align_xstrlen
+   endif
+   if !exists("g:drawit_xstrlen")
+    let g:drawit_xstrlen= 1
+   endif
+  endif
+
   " StartDrawIt: set up DrawIt commands {{{3
   com! -nargs=1 -range SetBrush <line1>,<line2>call DrawIt#SetBrush(<q-args>)
   com! -count Canvas call s:Spacer(line("."),line(".") + <count> - 1,0)
@@ -111,24 +135,24 @@ fun! DrawIt#StartDrawIt()
   let b:di_erase     = 0
 
   " StartDrawIt: option recording {{{3
-  let b:di_aikeep    = &ai
-  let b:di_cinkeep   = &cin
-  let b:di_cpokeep   = &cpo
-  let b:di_etkeep    = &et
-  let b:di_fokeep    = &fo
-  let b:di_gdkeep    = &gd
-  let b:di_gokeep    = &go
-  let b:di_magickeep = &magic
-  let b:di_remapkeep = &remap
-  let b:di_repkeep   = &report
-  let b:di_sikeep    = &si
-  let b:di_stakeep   = &sta
-  let b:di_vekeep    = &ve
-  set cpo&vim
-  set nocin noai nosi nogd sta et ve=all report=10000
-  set go-=aA
-  set fo-=a
-  set remap magic
+  let b:di_aikeep    = &l:ai
+  let b:di_cinkeep   = &l:cin
+  let b:di_cpokeep   = &l:cpo
+  let b:di_etkeep    = &l:et
+  let b:di_fokeep    = &l:fo
+  let b:di_gdkeep    = &l:gd
+  let b:di_gokeep    = &l:go
+  let b:di_magickeep = &l:magic
+  let b:di_remapkeep = &l:remap
+  let b:di_repkeep   = &l:report
+  let b:di_sikeep    = &l:si
+  let b:di_stakeep   = &l:sta
+  let b:di_vekeep    = &l:ve
+  setlocal cpo&vim
+  setlocal nocin noai nosi nogd sta et ve=all report=10000
+  setlocal go-=aA
+  setlocal fo-=a
+  setlocal remap magic
 
   " StartDrawIt: save and unmap user maps {{{3
   let b:lastdir    = 1
@@ -137,148 +161,154 @@ fun! DrawIt#StartDrawIt()
   else
    let usermaplead  = "\\"
   endif
-  call SaveUserMaps("n","","><^v","DrawIt")
-  call SaveUserMaps("v",usermaplead,"abeflsy","DrawIt")
-  call SaveUserMaps("n",usermaplead,"h><v^","DrawIt")
-  call SaveUserMaps("n","","<left>","DrawIt")
-  call SaveUserMaps("n","","<right>","DrawIt")
-  call SaveUserMaps("n","","<up>","DrawIt")
-  call SaveUserMaps("n","","<down>","DrawIt")
-  call SaveUserMaps("n","","<left>","DrawIt")
-  call SaveUserMaps("n","","<s-right>","DrawIt")
-  call SaveUserMaps("n","","<s-up>","DrawIt")
-  call SaveUserMaps("n","","<s-down>","DrawIt")
-  call SaveUserMaps("n","","<space>","DrawIt")
-  call SaveUserMaps("n","","<home>","DrawIt")
-  call SaveUserMaps("n","","<end>","DrawIt")
-  call SaveUserMaps("n","","<pageup>","DrawIt")
-  call SaveUserMaps("n","","<pagedown>","DrawIt")
-  call SaveUserMaps("n","","<leftmouse>","DrawIt")
-  call SaveUserMaps("n","","<middlemouse>","DrawIt")
-  call SaveUserMaps("n","","<rightmouse>","DrawIt")
-  call SaveUserMaps("n","","<leftdrag>","DrawIt")
-  call SaveUserMaps("n","","<s-leftmouse>","DrawIt")
-  call SaveUserMaps("n","","<s-leftdrag>","DrawIt")
-  call SaveUserMaps("n","","<s-leftrelease>","DrawIt")
-  call SaveUserMaps("n","","<c-leftmouse>","DrawIt")
-  call SaveUserMaps("n","","<c-leftdrag>","DrawIt")
-  call SaveUserMaps("n","","<c-leftrelease>","DrawIt")
-  call SaveUserMaps("n",usermaplead,":pa","DrawIt")
-  call SaveUserMaps("n",usermaplead,":pb","DrawIt")
-  call SaveUserMaps("n",usermaplead,":pc","DrawIt")
-  call SaveUserMaps("n",usermaplead,":pd","DrawIt")
-  call SaveUserMaps("n",usermaplead,":pe","DrawIt")
-  call SaveUserMaps("n",usermaplead,":pf","DrawIt")
-  call SaveUserMaps("n",usermaplead,":pg","DrawIt")
-  call SaveUserMaps("n",usermaplead,":ph","DrawIt")
-  call SaveUserMaps("n",usermaplead,":pi","DrawIt")
-  call SaveUserMaps("n",usermaplead,":pj","DrawIt")
-  call SaveUserMaps("n",usermaplead,":pk","DrawIt")
-  call SaveUserMaps("n",usermaplead,":pl","DrawIt")
-  call SaveUserMaps("n",usermaplead,":pm","DrawIt")
-  call SaveUserMaps("n",usermaplead,":pn","DrawIt")
-  call SaveUserMaps("n",usermaplead,":po","DrawIt")
-  call SaveUserMaps("n",usermaplead,":pp","DrawIt")
-  call SaveUserMaps("n",usermaplead,":pq","DrawIt")
-  call SaveUserMaps("n",usermaplead,":pr","DrawIt")
-  call SaveUserMaps("n",usermaplead,":ps","DrawIt")
-  call SaveUserMaps("n",usermaplead,":pt","DrawIt")
-  call SaveUserMaps("n",usermaplead,":pu","DrawIt")
-  call SaveUserMaps("n",usermaplead,":pv","DrawIt")
-  call SaveUserMaps("n",usermaplead,":pw","DrawIt")
-  call SaveUserMaps("n",usermaplead,":px","DrawIt")
-  call SaveUserMaps("n",usermaplead,":py","DrawIt")
-  call SaveUserMaps("n",usermaplead,":pz","DrawIt")
-  call SaveUserMaps("n",usermaplead,":ra","DrawIt")
-  call SaveUserMaps("n",usermaplead,":rb","DrawIt")
-  call SaveUserMaps("n",usermaplead,":rc","DrawIt")
-  call SaveUserMaps("n",usermaplead,":rd","DrawIt")
-  call SaveUserMaps("n",usermaplead,":re","DrawIt")
-  call SaveUserMaps("n",usermaplead,":rf","DrawIt")
-  call SaveUserMaps("n",usermaplead,":rg","DrawIt")
-  call SaveUserMaps("n",usermaplead,":rh","DrawIt")
-  call SaveUserMaps("n",usermaplead,":ri","DrawIt")
-  call SaveUserMaps("n",usermaplead,":rj","DrawIt")
-  call SaveUserMaps("n",usermaplead,":rk","DrawIt")
-  call SaveUserMaps("n",usermaplead,":rl","DrawIt")
-  call SaveUserMaps("n",usermaplead,":rm","DrawIt")
-  call SaveUserMaps("n",usermaplead,":rn","DrawIt")
-  call SaveUserMaps("n",usermaplead,":ro","DrawIt")
-  call SaveUserMaps("n",usermaplead,":rp","DrawIt")
-  call SaveUserMaps("n",usermaplead,":rq","DrawIt")
-  call SaveUserMaps("n",usermaplead,":rr","DrawIt")
-  call SaveUserMaps("n",usermaplead,":rs","DrawIt")
-  call SaveUserMaps("n",usermaplead,":rt","DrawIt")
-  call SaveUserMaps("n",usermaplead,":ru","DrawIt")
-  call SaveUserMaps("n",usermaplead,":rv","DrawIt")
-  call SaveUserMaps("n",usermaplead,":rw","DrawIt")
-  call SaveUserMaps("n",usermaplead,":rx","DrawIt")
-  call SaveUserMaps("n",usermaplead,":ry","DrawIt")
-  call SaveUserMaps("n",usermaplead,":rz","DrawIt")
+  call SaveUserMaps("bn","","><^v","DrawIt")
+  call SaveUserMaps("bv",usermaplead,"abceflsy","DrawIt")
+  call SaveUserMaps("bn","","<c-v>","DrawIt")
+  call SaveUserMaps("bn",usermaplead,"h><v^","DrawIt")
+  call SaveUserMaps("bn","","<left>","DrawIt")
+  call SaveUserMaps("bn","","<right>","DrawIt")
+  call SaveUserMaps("bn","","<up>","DrawIt")
+  call SaveUserMaps("bn","","<down>","DrawIt")
+  call SaveUserMaps("bn","","<left>","DrawIt")
+  call SaveUserMaps("bn","","<s-right>","DrawIt")
+  call SaveUserMaps("bn","","<s-up>","DrawIt")
+  call SaveUserMaps("bn","","<s-down>","DrawIt")
+  call SaveUserMaps("bn","","<space>","DrawIt")
+  call SaveUserMaps("bn","","<home>","DrawIt")
+  call SaveUserMaps("bn","","<end>","DrawIt")
+  call SaveUserMaps("bn","","<pageup>","DrawIt")
+  call SaveUserMaps("bn","","<pagedown>","DrawIt")
+  call SaveUserMaps("bn","","<c-leftdrag>","DrawIt")
+  call SaveUserMaps("bn","","<c-leftmouse>","DrawIt")
+  call SaveUserMaps("bn","","<c-leftrelease>","DrawIt")
+  call SaveUserMaps("bn","","<leftdrag>","DrawIt")
+  call SaveUserMaps("bn","","<leftmouse>","DrawIt")
+  call SaveUserMaps("bn","","<middlemouse>","DrawIt")
+  call SaveUserMaps("bn","","<rightmouse>","DrawIt")
+  call SaveUserMaps("bn","","<s-leftdrag>","DrawIt")
+  call SaveUserMaps("bn","","<s-leftmouse>","DrawIt")
+  call SaveUserMaps("bn","","<s-leftrelease>","DrawIt")
+  call SaveUserMaps("bv","","<c-leftmouse>","DrawIt")
+  call SaveUserMaps("bv","","<leftmouse>","DrawIt")
+  call SaveUserMaps("bv","","<middlemouse>","DrawIt")
+  call SaveUserMaps("bv","","<rightmouse>","DrawIt")
+  call SaveUserMaps("bv","","<s-leftmouse>","DrawIt")
+  call SaveUserMaps("bn",usermaplead,":pa","DrawIt")
+  call SaveUserMaps("bn",usermaplead,":pb","DrawIt")
+  call SaveUserMaps("bn",usermaplead,":pc","DrawIt")
+  call SaveUserMaps("bn",usermaplead,":pd","DrawIt")
+  call SaveUserMaps("bn",usermaplead,":pe","DrawIt")
+  call SaveUserMaps("bn",usermaplead,":pf","DrawIt")
+  call SaveUserMaps("bn",usermaplead,":pg","DrawIt")
+  call SaveUserMaps("bn",usermaplead,":ph","DrawIt")
+  call SaveUserMaps("bn",usermaplead,":pi","DrawIt")
+  call SaveUserMaps("bn",usermaplead,":pj","DrawIt")
+  call SaveUserMaps("bn",usermaplead,":pk","DrawIt")
+  call SaveUserMaps("bn",usermaplead,":pl","DrawIt")
+  call SaveUserMaps("bn",usermaplead,":pm","DrawIt")
+  call SaveUserMaps("bn",usermaplead,":pn","DrawIt")
+  call SaveUserMaps("bn",usermaplead,":po","DrawIt")
+  call SaveUserMaps("bn",usermaplead,":pp","DrawIt")
+  call SaveUserMaps("bn",usermaplead,":pq","DrawIt")
+  call SaveUserMaps("bn",usermaplead,":pr","DrawIt")
+  call SaveUserMaps("bn",usermaplead,":ps","DrawIt")
+  call SaveUserMaps("bn",usermaplead,":pt","DrawIt")
+  call SaveUserMaps("bn",usermaplead,":pu","DrawIt")
+  call SaveUserMaps("bn",usermaplead,":pv","DrawIt")
+  call SaveUserMaps("bn",usermaplead,":pw","DrawIt")
+  call SaveUserMaps("bn",usermaplead,":px","DrawIt")
+  call SaveUserMaps("bn",usermaplead,":py","DrawIt")
+  call SaveUserMaps("bn",usermaplead,":pz","DrawIt")
+  call SaveUserMaps("bn",usermaplead,":ra","DrawIt")
+  call SaveUserMaps("bn",usermaplead,":rb","DrawIt")
+  call SaveUserMaps("bn",usermaplead,":rc","DrawIt")
+  call SaveUserMaps("bn",usermaplead,":rd","DrawIt")
+  call SaveUserMaps("bn",usermaplead,":re","DrawIt")
+  call SaveUserMaps("bn",usermaplead,":rf","DrawIt")
+  call SaveUserMaps("bn",usermaplead,":rg","DrawIt")
+  call SaveUserMaps("bn",usermaplead,":rh","DrawIt")
+  call SaveUserMaps("bn",usermaplead,":ri","DrawIt")
+  call SaveUserMaps("bn",usermaplead,":rj","DrawIt")
+  call SaveUserMaps("bn",usermaplead,":rk","DrawIt")
+  call SaveUserMaps("bn",usermaplead,":rl","DrawIt")
+  call SaveUserMaps("bn",usermaplead,":rm","DrawIt")
+  call SaveUserMaps("bn",usermaplead,":rn","DrawIt")
+  call SaveUserMaps("bn",usermaplead,":ro","DrawIt")
+  call SaveUserMaps("bn",usermaplead,":rp","DrawIt")
+  call SaveUserMaps("bn",usermaplead,":rq","DrawIt")
+  call SaveUserMaps("bn",usermaplead,":rr","DrawIt")
+  call SaveUserMaps("bn",usermaplead,":rs","DrawIt")
+  call SaveUserMaps("bn",usermaplead,":rt","DrawIt")
+  call SaveUserMaps("bn",usermaplead,":ru","DrawIt")
+  call SaveUserMaps("bn",usermaplead,":rv","DrawIt")
+  call SaveUserMaps("bn",usermaplead,":rw","DrawIt")
+  call SaveUserMaps("bn",usermaplead,":rx","DrawIt")
+  call SaveUserMaps("bn",usermaplead,":ry","DrawIt")
+  call SaveUserMaps("bn",usermaplead,":rz","DrawIt")
   if exists("g:drawit_insertmode") && g:drawit_insertmode
-   call SaveUserMaps("i","","<left>","DrawIt")
-   call SaveUserMaps("i","","<right>","DrawIt")
-   call SaveUserMaps("i","","<up>","DrawIt")
-   call SaveUserMaps("i","","<down>","DrawIt")
-   call SaveUserMaps("i","","<left>","DrawIt")
-   call SaveUserMaps("i","","<s-right>","DrawIt")
-   call SaveUserMaps("i","","<s-up>","DrawIt")
-   call SaveUserMaps("i","","<s-down>","DrawIt")
-   call SaveUserMaps("i","","<home>","DrawIt")
-   call SaveUserMaps("i","","<end>","DrawIt")
-   call SaveUserMaps("i","","<pageup>","DrawIt")
-   call SaveUserMaps("i","","<pagedown>","DrawIt")
-   call SaveUserMaps("i","","<leftmouse>","DrawIt")
-  endif
-  call SaveUserMaps("n","",":\<c-v>","DrawIt")
+   call SaveUserMaps("bi","","<left>","DrawIt")
+   call SaveUserMaps("bi","","<right>","DrawIt")
+   call SaveUserMaps("bi","","<up>","DrawIt")
+   call SaveUserMaps("bi","","<down>","DrawIt")
+   call SaveUserMaps("bi","","<left>","DrawIt")
+   call SaveUserMaps("bi","","<s-right>","DrawIt")
+   call SaveUserMaps("bi","","<s-up>","DrawIt")
+   call SaveUserMaps("bi","","<s-down>","DrawIt")
+   call SaveUserMaps("bi","","<home>","DrawIt")
+   call SaveUserMaps("bi","","<end>","DrawIt")
+   call SaveUserMaps("bi","","<pageup>","DrawIt")
+   call SaveUserMaps("bi","","<pagedown>","DrawIt")
+   call SaveUserMaps("bi","","<leftmouse>","DrawIt")
+  endif
+  call SaveUserMaps("bn","",":\<c-v>","DrawIt")
 
   " StartDrawIt: DrawIt maps (Charles Campbell) {{{3
-  nmap <silent> <left>     :set lz<CR>:silent! call <SID>DrawLeft()<CR>:set nolz<CR>
-  nmap <silent> <right>    :set lz<CR>:silent! call <SID>DrawRight()<CR>:set nolz<CR>
-  nmap <silent> <up>       :set lz<CR>:silent! call <SID>DrawUp()<CR>:set nolz<CR>
-  nmap <silent> <down>     :set lz<CR>:silent! call <SID>DrawDown()<CR>:set nolz<CR>
-  nmap <silent> <s-left>   :set lz<CR>:silent! call <SID>MoveLeft()<CR>:set nolz<CR>
-  nmap <silent> <s-right>  :set lz<CR>:silent! call <SID>MoveRight()<CR>:set nolz<CR>
-  nmap <silent> <s-up>     :set lz<CR>:silent! call <SID>MoveUp()<CR>:set nolz<CR>
-  nmap <silent> <s-down>   :set lz<CR>:silent! call <SID>MoveDown()<CR>:set nolz<CR>
-  nmap <silent> <space>    :set lz<CR>:silent! call <SID>DrawErase()<CR>:set nolz<CR>
-  nmap <silent> >          :set lz<CR>:silent! call <SID>DrawSpace('>',1)<CR>:set nolz<CR>
-  nmap <silent> <          :set lz<CR>:silent! call <SID>DrawSpace('<',2)<CR>:set nolz<CR>
-  nmap <silent> ^          :set lz<CR>:silent! call <SID>DrawSpace('^',3)<CR>:set nolz<CR>
-  nmap <silent> v          :set lz<CR>:silent! call <SID>DrawSpace('v',4)<CR>:set nolz<CR>
-  nmap <silent> <home>     :set lz<CR>:silent! call <SID>DrawSlantUpLeft()<CR>:set nolz<CR>
-  nmap <silent> <end>      :set lz<CR>:silent! call <SID>DrawSlantDownLeft()<CR>:set nolz<CR>
-  nmap <silent> <pageup>   :set lz<CR>:silent! call <SID>DrawSlantUpRight()<CR>:set nolz<CR>
-  nmap <silent> <pagedown> :set lz<CR>:silent! call <SID>DrawSlantDownRight()<CR>:set nolz<CR>
-  nmap <silent> <Leader>>	:set lz<CR>:silent! call <SID>DrawFatRArrow()<CR>:set nolz<CR>
-  nmap <silent> <Leader><	:set lz<CR>:silent! call <SID>DrawFatLArrow()<CR>:set nolz<CR>
-  nmap <silent> <Leader>^	:set lz<CR>:silent! call <SID>DrawFatUArrow()<CR>:set nolz<CR>
-  nmap <silent> <Leader>v	:set lz<CR>:silent! call <SID>DrawFatDArrow()<CR>:set nolz<CR>
-  nmap <silent> <Leader>f  :call <SID>Flood()<cr>
+  nmap <silent> <buffer> <script> <left>     :set lz<CR>:silent! call <SID>DrawLeft()<CR>:set nolz<CR>
+  nmap <silent> <buffer> <script> <right>    :set lz<CR>:silent! call <SID>DrawRight()<CR>:set nolz<CR>
+  nmap <silent> <buffer> <script> <up>       :set lz<CR>:silent! call <SID>DrawUp()<CR>:set nolz<CR>
+  nmap <silent> <buffer> <script> <down>     :set lz<CR>:silent! call <SID>DrawDown()<CR>:set nolz<CR>
+  nmap <silent> <buffer> <script> <s-left>   :set lz<CR>:silent! call <SID>MoveLeft()<CR>:set nolz<CR>
+  nmap <silent> <buffer> <script> <s-right>  :set lz<CR>:silent! call <SID>MoveRight()<CR>:set nolz<CR>
+  nmap <silent> <buffer> <script> <s-up>     :set lz<CR>:silent! call <SID>MoveUp()<CR>:set nolz<CR>
+  nmap <silent> <buffer> <script> <s-down>   :set lz<CR>:silent! call <SID>MoveDown()<CR>:set nolz<CR>
+  nmap <silent> <buffer> <script> <space>    :set lz<CR>:silent! call <SID>DrawErase()<CR>:set nolz<CR>
+  nmap <silent> <buffer> <script> >          :set lz<CR>:silent! call <SID>DrawSpace('>',1)<CR>:set nolz<CR>
+  nmap <silent> <buffer> <script> <          :set lz<CR>:silent! call <SID>DrawSpace('<',2)<CR>:set nolz<CR>
+  nmap <silent> <buffer> <script> ^          :set lz<CR>:silent! call <SID>DrawSpace('^',3)<CR>:set nolz<CR>
+  nmap <silent> <buffer> <script> v          :set lz<CR>:silent! call <SID>DrawSpace('v',4)<CR>:set nolz<CR>
+  nmap <silent> <buffer> <script> <home>     :set lz<CR>:silent! call <SID>DrawSlantUpLeft()<CR>:set nolz<CR>
+  nmap <silent> <buffer> <script> <end>      :set lz<CR>:silent! call <SID>DrawSlantDownLeft()<CR>:set nolz<CR>
+  nmap <silent> <buffer> <script> <pageup>   :set lz<CR>:silent! call <SID>DrawSlantUpRight()<CR>:set nolz<CR>
+  nmap <silent> <buffer> <script> <pagedown> :set lz<CR>:silent! call <SID>DrawSlantDownRight()<CR>:set nolz<CR>
+  nmap <silent> <buffer> <script> <Leader>>	:set lz<CR>:silent! call <SID>DrawFatRArrow()<CR>:set nolz<CR>
+  nmap <silent> <buffer> <script> <Leader><	:set lz<CR>:silent! call <SID>DrawFatLArrow()<CR>:set nolz<CR>
+  nmap <silent> <buffer> <script> <Leader>^	:set lz<CR>:silent! call <SID>DrawFatUArrow()<CR>:set nolz<CR>
+  nmap <silent> <buffer> <script> <Leader>v	:set lz<CR>:silent! call <SID>DrawFatDArrow()<CR>:set nolz<CR>
+  nmap <silent> <buffer> <script> <Leader>f  :call <SID>Flood()<cr>
 
   " StartDrawIt: Set up insertmode maps {{{3
   if exists("g:drawit_insertmode") && g:drawit_insertmode
-   imap <buffer> <silent> <left>     <Esc><left>a
-   imap <buffer> <silent> <right>    <Esc><right>a
-   imap <buffer> <silent> <up>       <Esc><up>a
-   imap <buffer> <silent> <down>     <Esc><down>a
-   imap <buffer> <silent> <left>   <Esc><left>a
-   imap <buffer> <silent> <s-right>  <Esc><s-right>a
-   imap <buffer> <silent> <s-up>     <Esc><s-up>a
-   imap <buffer> <silent> <s-down>   <Esc><s-down>a
-   imap <buffer> <silent> <home>     <Esc><home>a
-   imap <buffer> <silent> <end>      <Esc><end>a
-   imap <buffer> <silent> <pageup>   <Esc><pageup>a
-   imap <buffer> <silent> <pagedown> <Esc><pagedown>a
+   imap <silent> <buffer> <script> <left>     <Esc><left>a
+   imap <silent> <buffer> <script> <right>    <Esc><right>a
+   imap <silent> <buffer> <script> <up>       <Esc><up>a
+   imap <silent> <buffer> <script> <down>     <Esc><down>a
+   imap <silent> <buffer> <script> <left>     <Esc><left>a
+   imap <silent> <buffer> <script> <s-right>  <Esc><s-right>a
+   imap <silent> <buffer> <script> <s-up>     <Esc><s-up>a
+   imap <silent> <buffer> <script> <s-down>   <Esc><s-down>a
+   imap <silent> <buffer> <script> <home>     <Esc><home>a
+   imap <silent> <buffer> <script> <end>      <Esc><end>a
+   imap <silent> <buffer> <script> <pageup>   <Esc><pageup>a
+   imap <silent> <buffer> <script> <pagedown> <Esc><pagedown>a
   endif
 
   " StartDrawIt: set up drawing mode mappings (Sylvain Viart) {{{3
-  nnoremap <buffer> <silent> <c-v>      :call <SID>LeftStart()<CR><c-v>
-  vmap     <buffer> <silent> <Leader>a  :<c-u>call <SID>CallBox('Arrow')<CR>
-  vmap     <buffer> <silent> <Leader>b  :<c-u>call <SID>CallBox('DrawBox')<cr>
-  nmap     <buffer>          <Leader>c  :call <SID>Canvas()<cr>
-  vmap     <buffer> <silent> <Leader>l  :<c-u>call <SID>CallBox('DrawPlainLine')<CR>
-  vmap     <buffer> <silent> <Leader>s  :<c-u>call <SID>Spacer(line("'<"), line("'>"),0)<cr>
+  nnoremap <silent> <buffer> <script> <c-v>      :call <SID>LeftStart()<CR><c-v>
+  vmap     <silent> <buffer> <script> <Leader>a  :<c-u>call <SID>CallBox('Arrow')<CR>
+  vmap     <silent> <buffer> <script> <Leader>b  :<c-u>call <SID>CallBox('DrawBox')<cr>
+  nmap              <buffer> <script> <Leader>c  :call <SID>Canvas()<cr>
+  vmap     <silent> <buffer> <script> <Leader>l  :<c-u>call <SID>CallBox('DrawPlainLine')<CR>
+  vmap     <silent> <buffer> <script> <Leader>s  :<c-u>call <SID>Spacer(line("'<"), line("'>"),0)<cr>
 
   " StartDrawIt: set up drawing mode mappings (Charles Campbell) {{{3
   " \pa ... \pz : blanks are transparent
@@ -288,25 +318,25 @@ fun! DrawIt#StartDrawIt()
   let allreg= "abcdefghijklmnopqrstuvwxyz"
   while strlen(allreg) > 0
    let ireg= strpart(allreg,0,1)
-   exe "nmap <buffer> <silent> <Leader>p".ireg.'  :<c-u>set lz<cr>:silent! call <SID>PutBlock("'.ireg.'",0)<cr>:set nolz<cr>'
-   exe "nmap <buffer> <silent> <Leader>r".ireg.'  :<c-u>set lz<cr>:silent! call <SID>PutBlock("'.ireg.'",1)<cr>:set nolz<cr>'
+   exe "nmap <silent> <buffer> <Leader>p".ireg.'  :<c-u>set lz<cr>:silent! call <SID>PutBlock("'.ireg.'",0)<cr>:set nolz<cr>'
+   exe "nmap <silent> <buffer> <Leader>r".ireg.'  :<c-u>set lz<cr>:silent! call <SID>PutBlock("'.ireg.'",1)<cr>:set nolz<cr>'
    let allreg= strpart(allreg,1)
   endwhile
 
   " StartDrawIt: mouse maps  (Sylvain Viart) {{{3
   " start visual-block with leftmouse
-  nnoremap <buffer> <silent> <leftmouse>    <leftmouse>:call <SID>LeftStart()<CR><c-v>
-  vnoremap <buffer> <silent> <rightmouse>   <leftmouse>:<c-u>call <SID>RightStart(1)<cr>
-  vnoremap <buffer> <silent> <middlemouse>  <leftmouse>:<c-u>call <SID>RightStart(0)<cr>
-  vnoremap <buffer> <silent> <c-leftmouse>  <leftmouse>:<c-u>call <SID>CLeftStart()<cr>
+  nnoremap <silent> <buffer> <script> <leftmouse>    <leftmouse>:call <SID>LeftStart()<CR><c-v>
+  vnoremap <silent> <buffer> <script> <rightmouse>   <leftmouse>:<c-u>call <SID>RightStart(1)<cr>
+  vnoremap <silent> <buffer> <script> <middlemouse>  <leftmouse>:<c-u>call <SID>RightStart(0)<cr>
+  vnoremap <silent> <buffer> <script> <c-leftmouse>  <leftmouse>:<c-u>call <SID>CLeftStart()<cr>
 
   " StartDrawIt: mouse maps (Charles Campbell) {{{3
   " Draw with current brush
-  nnoremap <buffer> <silent> <s-leftmouse>  <leftmouse>:call <SID>SLeftStart()<CR><c-v>
-  nnoremap <buffer> <silent> <c-leftmouse>  <leftmouse>:call <SID>CLeftStart()<CR><c-v>
+  nnoremap <silent> <buffer> <script> <s-leftmouse>  <leftmouse>:call <SID>SLeftStart()<CR><c-v>
+  nnoremap <silent> <buffer> <script> <c-leftmouse>  <leftmouse>:call <SID>CLeftStart()<CR><c-v>
 
  " StartDrawIt: Menu support {{{3
- if has("gui_running") && has("menu") && &go =~ 'm'
+ if has("gui_running") && has("menu") && &go =~# 'm'
   exe 'menu '.g:DrChipTopLvlMenu.'DrawIt.Stop\ \ DrawIt<tab>\\ds				<Leader>ds'
   exe 'menu '.g:DrChipTopLvlMenu.'DrawIt.Toggle\ Erase\ Mode<tab><space>	<space>'
   exe 'menu '.g:DrChipTopLvlMenu.'DrawIt.Draw\ Arrow<tab>\\a					<Leader>a'
@@ -362,19 +392,19 @@ fun! DrawIt#StopDrawIt()
   call RestoreUserMaps("DrawIt")
 
   " StopDrawIt: restore user's options {{{3
-  let &ai     = b:di_aikeep
-  let &cin    = b:di_cinkeep
-  let &cpo    = b:di_cpokeep
-  let &et     = b:di_etkeep
-  let &fo     = b:di_fokeep
-  let &gd     = b:di_gdkeep
-  let &go     = b:di_gokeep
-  let &magic  = b:di_magickeep
-  let &remap  = b:di_remapkeep
-  let &report = b:di_repkeep
-  let &si     = b:di_sikeep
-  let &sta    = b:di_stakeep
-  let &ve     = b:di_vekeep
+  let &l:ai     = b:di_aikeep
+  let &l:cin    = b:di_cinkeep
+  let &l:cpo    = b:di_cpokeep
+  let &l:et     = b:di_etkeep
+  let &l:fo     = b:di_fokeep
+  let &l:gd     = b:di_gdkeep
+  let &l:go     = b:di_gokeep
+  let &l:magic  = b:di_magickeep
+  let &l:remap  = b:di_remapkeep
+  let &l:report = b:di_repkeep
+  let &l:si     = b:di_sikeep
+  let &l:sta    = b:di_stakeep
+  let &l:ve     = b:di_vekeep
   unlet b:di_aikeep  
   unlet b:di_cinkeep 
   unlet b:di_cpokeep 
@@ -390,7 +420,7 @@ fun! DrawIt#StopDrawIt()
   unlet b:di_vekeep  
 
  " StopDrawIt: DrChip menu support: {{{3
- if has("gui_running") && has("menu") && &go =~ 'm'
+ if has("gui_running") && has("menu") && &go =~# 'm'
   exe 'menu   '.g:DrChipTopLvlMenu.'DrawIt.Start\ DrawIt<tab>\\di		<Leader>di'
   exe 'unmenu '.g:DrChipTopLvlMenu.'DrawIt.Stop\ \ DrawIt'
   exe 'unmenu '.g:DrChipTopLvlMenu.'DrawIt.Toggle\ Erase\ Mode'
@@ -732,7 +762,7 @@ fun! s:ReplaceDownLeft()
   let curcol = virtcol(".")
   if curcol != virtcol("$")
    let curchar= strpart(getline("."),curcol-1,1)
-   if curchar == "\\" || curchar == "X"
+   if curchar == b:di_upleft || curchar == b:di_cross
     exe "norm! r".b:di_cross
    else
     exe "norm! r".b:di_upright
@@ -750,7 +780,7 @@ fun! s:ReplaceDownRight()
   let curcol = virtcol(".")
   if curcol != virtcol("$")
    let curchar= strpart(getline("."),curcol-1,1)
-   if curchar == "/" || curchar == "X"
+   if curchar == b:di_upright || curchar == b:di_cross
     exe "norm! r".b:di_cross
    else
     exe "norm! r".b:di_upleft
@@ -975,7 +1005,7 @@ fun! s:Flood()
   let s:fillchar= input("Enter fill character: ")
   call inputrestore()
   let s:bndry= "[".escape(s:bndry.s:fillchar,'\-]^')."]"
-  if strlen(s:fillchar) > 1
+  if s:Strlen(s:fillchar) > 1
    let s:fillchar= strpart(s:fillchar,0,1)
   endif
 
@@ -1143,34 +1173,46 @@ endfun
 "                     = 1: Blanks copy over
 "                     = 2: Erase all drawing characters
 "
+"DechoTabOn
 fun! s:PutBlock(block,replace)
-"  call Dfunc("s:PutBlock(block<".a:block."> replace=".a:replace.")")
+"  call Dfunc("s:PutBlock(block<".a:block."> replace=".a:replace.") g:drawit_xstrlen=".g:drawit_xstrlen)
   call s:SavePosn()
   exe "let block  = @".a:block
   let blocklen    = strlen(block)
   let drawit_line = line('.')
   let drawchars   = '['.escape(b:di_vert.b:di_horiz.b:di_plus.b:di_upright.b:di_upleft.b:di_cross,'\-').']'
+"  call Decho("blocklen=".blocklen." block<".string(block).">")
 
   " insure that putting a block will do so in a region containing spaces out to textwidth
-  exe "let blockrows= strlen(substitute(@".a:block.",'[^[:cntrl:]]','','g'))"
-  exe 'let blockcols= strlen(substitute(@'.a:block.",'^\\(.\\{-}\\)\\n\\_.*$','\\1',''))"
+  exe "let blockrows= s:Strlen(substitute(@".a:block.",'[^[:cntrl:]]','','g'))"
+  exe 'let blockcols= s:Strlen(substitute(@'.a:block.",'^\\(.\\{-}\\)\\n\\_.*$','\\1',''))"
   let curline= line('.')
   let curcol = virtcol('.')
 "  call Decho("blockrows=".blockrows." blockcols=".blockcols." curline=".curline." curcol=".curcol)
   call s:AutoCanvas(curline-1,curline + blockrows+1,curcol + blockcols)
 
-  let iblock      = 0
+  let iblock= 0
   while iblock < blocklen
-  	let chr= strpart(block,iblock,1)
+   " the following logic should permit 1, 2, or 4 byte glyphs (I've only tested it with 1 and 2)
+  	let chr= strpart(block,iblock,4)
+	if char2nr(chr) <= 255
+  	 let chr= strpart(block,iblock,1)
+	elseif char2nr(chr) <= 65536
+  	 let chr= strpart(block,iblock,2)
+	 let iblock= iblock + 1
+	else
+	 let iblock= iblock + 3
+	endif
+"	call Decho("iblock=".iblock." chr#".char2nr(chr)."<".string(chr).">")
 
 	if char2nr(chr) == 10
 	 " handle newline
 	 let drawit_line= drawit_line + 1
-    if b:drawit_col_{s:saveposn_count} == 0
-     exe "norm! ".drawit_line."G0"
-    else
-     exe "norm! ".drawit_line."G0".b:drawit_col_{s:saveposn_count}."l"
-    endif
+     if b:drawit_col_{s:saveposn_count} == 0
+      exe "norm! ".drawit_line."G0"
+     else
+      exe "norm! ".drawit_line."G0".b:drawit_col_{s:saveposn_count}."l"
+     endif
 
 	elseif a:replace == 2
 	 " replace all drawing characters with blanks
@@ -1209,11 +1251,11 @@ fun! s:AutoCanvas(linestart,linestop,cols)
   endif
 
   " insure that any tabs contained within the selected region are converted to blanks
-  let etkeep= &et
+  let etkeep= &l:et
   set et
 "  call Decho("exe ".a:linestart.",".a:linestop."retab")
   exe a:linestart.",".a:linestop."retab"
-  let &et= etkeep
+  let &l:et= etkeep
 
   " insure that there's whitespace to textwidth/screenwidth/a:cols
   if a:cols <= 0
@@ -1233,6 +1275,47 @@ fun! s:AutoCanvas(linestart,linestop,cols)
 "  call Dret("s:AutoCanvas : tw=".tw)
 endfun
 
+" ---------------------------------------------------------------------
+" s:Strlen: this function returns the length of a string, even if its {{{2
+"           using two-byte etc characters.
+"           Currently, its only used if g:Align_xstrlen is set to a
+"           nonzero value.  Solution from Nicolai Weibull, vim docs
+"           (:help strlen()), Tony Mechelynck, and my own invention.
+fun! s:Strlen(x)
+"  call Dfunc("s:Strlen(x<".a:x.">")
+  
+  if g:drawit_xstrlen == 1
+   " number of codepoints (Latin a + combining circumflex is two codepoints)
+   " (comment from TM, solution from NW)
+   let ret= strlen(substitute(a:x,'.','c','g'))
+
+  elseif g:drawit_xstrlen == 2
+   " number of spacing codepoints (Latin a + combining circumflex is one spacing 
+   " codepoint; a hard tab is one; wide and narrow CJK are one each; etc.)
+   " (comment from TM, solution from TM)
+   let ret= strlen(substitute(a:x, '.\Z', 'x', 'g')) 
+
+  elseif g:drawit_xstrlen == 3
+   " virtual length (counting, for instance, tabs as anything between 1 and 
+   " 'tabstop', wide CJK as 2 rather than 1, Arabic alif as zero when immediately 
+   " preceded by lam, one otherwise, etc.)
+   " (comment from TM, solution from me)
+   let modkeep= &l:mod
+   exe "norm! o\<esc>"
+   call setline(line("."),a:x)
+   let ret= virtcol("$") - 1
+   d
+   let &l:mod= modkeep
+
+  else
+   " at least give a decent default
+   let ret= strlen(a:x)
+  endif
+
+"  call Dret("s:Strlen ".ret)
+  return ret
+endfun
+
 " =====================================================================
 "  DrawIt Functions: (by Sylvain Viart) {{{1
 " =====================================================================
@@ -1287,8 +1370,16 @@ endf
 fun! s:CallBox(func_name)
 "  call Dfunc("s:CallBox(func_name<".a:func_name.">)")
 
-  let xdep = b:xmouse_start
-  let ydep = b:ymouse_start
+  if exists("b:xmouse_start")
+   let xdep = b:xmouse_start
+  else
+   let xdep= 0
+  endif
+  if exists("b:ymouse_start")
+   let ydep = b:ymouse_start
+  else
+   let ydep= 0
+  endif
   let col0   = virtcol("'<")
   let row0   = line("'<")
   let col1   = virtcol("'>")
@@ -1321,30 +1412,34 @@ endf
 " s:DrawBox: {{{2
 fun! s:DrawBox(x0, y0, x1, y1)
 "  call Dfunc("s:DrawBox(xy0[".a:x0.",".a:y0." xy1[".a:x1.",".a:y1."])")
-   " loop each line
-   let l = a:y0
-   while l <= a:y1
-      let c = a:x0
-      while c <= a:x1
-         if l == a:y0 || l == a:y1
-            let remp = '-'
-            if c == a:x0 || c == a:x1
-               let remp = '+'
-            endif
-         else
-            let remp = '|'
-            if c != a:x0 && c != a:x1
-               let remp = '.'
-            endif
-         endif
-
-         if remp != '.'
-            call s:SetCharAt(remp, c, l)
-         endif
-         let c  = c + 1
-      endw
-      let l = l + 1
+  " loop each line
+  let x0= (a:x1 > a:x0)? a:x0 : a:x1
+  let x1= (a:x1 > a:x0)? a:x1 : a:x0
+  let y0= (a:y1 > a:y0)? a:y0 : a:y1
+  let y1= (a:y1 > a:y0)? a:y1 : a:y0
+  let l = y0
+  while l <= y1
+   let c = x0
+   while c <= x1
+    if l == y0 || l == y1
+	 let remp = b:di_horiz
+     if c == x0 || c == x1
+	  let remp = b:di_plus
+     endif
+    else
+	 let remp = b:di_vert
+     if c != x0 && c != x1
+      let remp = '.'
+     endif
+    endif
+
+    if remp != '.'
+     call s:SetCharAt(remp, c, l)
+    endif
+    let c  = c + 1
    endw
+   let l = l + 1
+  endw
 
 "  call Dret("s:DrawBox")
 endf
@@ -1355,9 +1450,20 @@ fun! s:SetCharAt(char, x, y)
 "  call Dfunc("s:SetCharAt(char<".a:char."> xy[".a:x.",".a:y."])")
 
   let content = getline(a:y)
-  let long    = strlen(content)
-  let deb     = strpart(content, 0, a:x - 1)
-  let fin     = strpart(content, a:x, long)
+  if g:drawit_xstrlen == 0
+   let long    = strlen(content)
+   let deb     = strpart(content, 0, a:x - 1)
+   let fin     = strpart(content, a:x, long)
+  else
+   let long    = s:Strlen(content)
+   let xm1  = a:x - 1
+   let extra= 0
+   while s:Strlen(strpart(content,0,xm1+extra)) < xm1
+	let extra= extra + 1
+   endwhile
+   let deb     = strpart(content, 0, xm1 + extra)
+   let fin     = strpart(content, xm1 + extra + 1, long)
+  endif
   call setline(a:y, deb.a:char.fin)
 
 "  call Dret("s:SetCharAt")
@@ -1411,9 +1517,9 @@ fun! s:DrawLine(x0, y0, x1, y1, horiz)
         let char = a:horiz
         if fraction >= 0
            if stepx > 0
-              let char = '\'
+			let char = b:di_upleft
            else
-              let char = '/'
+			let char = b:di_upright
            endif
            let y0 = y0 + stepy
            let fraction = fraction - dx    " same as fraction -= 2*dx
@@ -1424,16 +1530,16 @@ fun! s:DrawLine(x0, y0, x1, y1, horiz)
      endw
   else
      " move under y
-     let char = '|'
+	 let char = b:di_vert
      call s:SetCharAt(char, x0, y0)
      let fraction = dx - (dy / 2)
      while y0 != y1
-        let char = '|'
+	    let char = b:di_vert
         if fraction >= 0
            if stepy > 0 || stepx < 0
-              let char = '\'
+			let char = b:di_upleft
            else
-              let char = '/'
+			let char = b:di_upright
            endif
            let x0 = x0 + stepx
            let fraction = fraction - dy
@@ -1452,7 +1558,7 @@ endf
 fun! s:Arrow(x0, y0, x1, y1)
 "  call Dfunc("s:Arrow(xy0[".a:x0.",".a:y0."] xy1[".a:x1.",".a:y1."])")
 
-  call s:DrawLine(a:x0, a:y0, a:x1, a:y1,'-')
+  call s:DrawLine(a:x0, a:y0, a:x1, a:y1,b:di_horiz)
   let dy = a:y1 - a:y0
   let dx = a:x1 - a:x0
   if s:Abs(dx) > <SID>Abs(dy)
@@ -1506,7 +1612,7 @@ fun! s:LeftStart()
 "  call Dfunc("s:LeftStart()")
   let b:xmouse_start = virtcol('.')
   let b:ymouse_start = line('.')
-  vnoremap <silent> <leftrelease> <leftrelease>:<c-u>call <SID>LeftRelease()<cr>gv
+  vnoremap <silent> <buffer> <script> <leftrelease> <leftrelease>:<c-u>call <SID>LeftRelease()<cr>gv
 "  call Dret("s:LeftStart : [".b:ymouse_start.",".b:xmouse_start."]")
 endf!
 
@@ -1514,7 +1620,7 @@ endf!
 " s:LeftRelease: {{{2
 fun! s:LeftRelease()
 "  call Dfunc("s:LeftRelease()")
-  vunmap <leftrelease>
+  vunmap <buffer> <leftrelease>
 "  call Dret("s:LeftRelease : [".line('.').','.virtcol('.').']')
 endf
 
@@ -1525,8 +1631,8 @@ fun! s:SLeftStart()
    let b:drawit_brush= "a"
   endif
 "  call Dfunc("s:SLeftStart() brush=".b:drawit_brush.' ['.line('.').','.virtcol('.').']')
-  noremap <silent> <s-leftdrag>    <leftmouse>:<c-u>call <SID>SLeftDrag()<cr>
-  noremap <silent> <s-leftrelease> <leftmouse>:<c-u>call <SID>SLeftRelease()<cr>
+  noremap <silent> <buffer> <script> <s-leftdrag>    <leftmouse>:<c-u>call <SID>SLeftDrag()<cr>
+  noremap <silent> <buffer> <script> <s-leftrelease> <leftmouse>:<c-u>call <SID>SLeftRelease()<cr>
 "  call Dret("s:SLeftStart")
 endfun
 
@@ -1545,8 +1651,8 @@ endfun
 fun! s:SLeftRelease()
 "  call Dfunc("s:SLeftRelease() brush=".b:drawit_brush.' ['.line('.').','.virtcol('.').']')
   call s:SLeftDrag()
-  nunmap <s-leftdrag>
-  nunmap <s-leftrelease>
+  nunmap <buffer> <s-leftdrag>
+  nunmap <buffer> <s-leftrelease>
 "  call Dret("s:SLeftRelease")
 endfun
 
@@ -1577,8 +1683,8 @@ fun! s:CLeftStart()
    unlet s:cleft_oldblock
   endif
 "  call Decho("blocksize: ".s:cleft_height."x".s:cleft_width)
-  noremap <silent> <c-leftdrag>    :<c-u>call <SID>CLeftDrag()<cr>
-  noremap <silent> <c-leftrelease> <leftmouse>:<c-u>call <SID>CLeftRelease()<cr>
+  noremap <silent> <buffer> <script> <c-leftdrag>    :<c-u>call <SID>CLeftDrag()<cr>
+  noremap <silent> <buffer> <script> <c-leftrelease> <leftmouse>:<c-u>call <SID>CLeftRelease()<cr>
 "  call Dret("s:CLeftStart")
 endfun
 
@@ -1630,8 +1736,8 @@ endfun
 fun! s:CLeftRelease()
 "  call Dfunc("s:CLeftRelease()")
   call s:CLeftDrag()
-  nunmap <c-leftdrag>
-  nunmap <c-leftrelease>
+  nunmap <buffer> <c-leftdrag>
+  nunmap <buffer> <c-leftrelease>
   unlet s:cleft_oldblock s:cleft_height s:cleft_width
 "  call Dret("s:CLeftRelease")
 endfun
diff --git a/doc/DrawIt.txt b/doc/DrawIt.txt
index bae86ff..55afafa 100644
--- a/doc/DrawIt.txt
+++ b/doc/DrawIt.txt
@@ -1,9 +1,9 @@
-*drawit.txt*	The DrawIt Tool				Jun 12, 2008
+*DrawIt.txt*	The DrawIt Tool				Feb 22, 2011
 
 Authors:  Charles E. Campbell, Jr.  <NdrchipO@ScampbellPfamily.AbizM> {{{1
           Sylvain Viart             <molo@multimania.com>
 	  (remove NOSPAM from Campbell's email first)
-Copyright:    Copyright (C) 2004-2007 Charles E. Campbell, Jr. {{{1
+Copyright:    Copyright (C) 2004-2011 Charles E. Campbell, Jr. {{{1
               Permission is hereby granted to use and distribute this code,
               with or without modifications, provided that this copyright
               notice is copied with it. Like anything else that's free,
@@ -24,6 +24,7 @@ Copyright:    Copyright (C) 2004-2007 Charles E. Campbell, Jr. {{{1
 	     Stopping....................: |drawit-stop|
 	     User Map Protection.........: |drawit-protect|
 	     Drawing.....................: |drawit-drawing|
+	     Tip.........................: |drawit-tip|
 	     Changing Drawing Characters.: |drawit-setdrawit|
 	     Moving......................: |drawit-moving|
 	     Erasing.....................: |drawit-erase|
@@ -41,10 +42,11 @@ Copyright:    Copyright (C) 2004-2007 Charles E. Campbell, Jr. {{{1
  || Starting &   |                                                           ||
  || Stopping     | Explanation                                               ||
  ++--------------+-----------------------------------------------------------++
- ||  \di         | start DrawIt  |drawit-start|                              ||
- ||  \ds         | stop  DrawIt  |drawit-stop|                               ||
- ||  :DIstart    | start DrawIt  |drawit-start|                              ||
- ||  :DIstop     | stop  DrawIt  |drawit-stop|                               ||
+ ||  \di         | start DrawIt       |drawit-start|                         ||
+ ||  \ds         | stop  DrawIt       |drawit-stop|                          ||
+ ||  :DIstart    | start DrawIt       |drawit-start|                         ||
+ ||  :DIstop     | stop  DrawIt       |drawit-stop|                          ||
+ ||  :DrawIt[!]  | start/stop DrawIt  |drawit-start| |drawit-stop|           ||
  ||              |                                                           ||
  ++==============+===========================================================++
  ||   Maps       | Explanation                                               ||
@@ -114,7 +116,7 @@ Copyright:    Copyright (C) 2004-2007 Charles E. Campbell, Jr. {{{1
  ++=======================+==================================================++
  ||  Commands             | Explanation                                      ||
  ++-----------------------+--------------------------------------------------++
- ||  :SetBrush a-z        | sets brush (register) to given register          || 
+ ||  :SetBrush a-z        | sets brush (register) to given register          ||
  ||  :'<,'>SetBrush a-z   | yanks visual block to brush (register)           ||
  \============================================================================/
 
@@ -147,7 +149,7 @@ A message, "[DrawIt off]", will appear on the message line.
 USER MAP PROTECTION					*drawit-protect* {{{2
 
 Starting DrawIt causes it to set up a number of maps which facilitate drawing.
-DrawIt accomodates users with conflicting maps by saving both maps and user
+DrawIt accommodates users with conflicting maps by saving both maps and user
 options and before setting them to what DrawIt needs.  When you stop DrawIt
 (|drawit-stop|), DrawIt will restore the user's maps and options as they were
 before DrawIt was started.
@@ -198,6 +200,22 @@ where SetDrawit()'s arguments refer, in order, to the >
 	ellipse boundary                drawing character
 <
 
+TIP							*drawit-tip*
+
+I have found that sometimes one or more of the <home>, <end>, <pageup>,
+and <pagedown> keys give unique sequences but are not interpreted
+properly by Vim.  This problem impacts DrawIt as it uses those four
+keys to signify diagonal moves/drawing.  One solution I use is to
+put into my <.vimrc> file mapings like:
+
+	map ^V... <home>
+
+where the ellipsis (...) is the actual character sequence produced by
+hitting the key.  The way to generate such maps is to type "map ",
+followed by three control-v presses, press the associated key, then
+a space followed by the proper interpretation sequence (ie. <home>).
+
+
 MOVING					*drawit-move* *drawit-moving* {{{2
 
 DrawIt supports shifting the arrow keys to cause motion of the cursor.  The
@@ -289,16 +307,16 @@ DrawIt is enabled, virtualedit is also enabled (to "all").
 							*drawit-setbrush*
 BRUSHES							*drawit-brush* {{{2
 >
- :SetBrush a-z
+ :SetBrush [a-z]
 <
-	Set the current brush to the given letter (actually, its
-	a named register).  Default brush: a >
+	Set the current brush to the selected brush register:
+>
 		ex.  :SetBrush b
 
- :'<,'>SetBrush a-z
+ :'<,'>SetBrush [a-z]
 <
-	Set the current brush to the given letter, and yank the visual
-	block to that named register).  Default brush: a
+	Select text for the brush by using visual-block mode: ctrl-v, move .
+	Then set the current text into the brush register:  (default brush: a)
 >
  <leftmouse>
 <
@@ -330,14 +348,14 @@ BRUSHES							*drawit-brush* {{{2
 	Example: Draw the following >
 			\ \
 			o o
-			 * 
+			 *
 			---
 <		Then use ctrl-v, move, "ay to grab a copy into register a.
 		By default, the current brush uses register a (change brush
 		with :SetBrush [reg]).  Hold the <shift> and <leftbutton>
 		keys down and move the mouse; as you move, a copy of the
 		brush will be left behind.
-	    
+	
 
 DRAWIT MODES						*drawit-modes* {{{2
 
@@ -353,47 +371,54 @@ DRAWIT MODES						*drawit-modes* {{{2
 ==============================================================================
 4. History						*drawit-history* {{{1
 
+	11 Jan 21, 2010	* (Evan Stern) several places were using hardcoded
+			  drawing characters instead of b:di_... equivalents
+	   Feb 22, 2011	* for menus, &go =~# used to insure correct case
 	10 Jun 12, 2008	* Fixed a bug with ctrl-leftmouse (which was leaving
 			  a space in the original selected text)
-	9 Sep 14, 2007 * Johann-Guenter Simon fixed a bug with s:DrawErase();
-	                 it called SetDrawIt() and that call hadn't been 
-			 updated to account for the new b:di_ellipse
-			 parameter.
-	8 Feb 12, 2007 * fixed a bug which prevented multi-character user
-	                 maps from being restored properly
-	  May 03, 2007 * Extended SetDrawIt() to handle b:di_ellipse, the
-	                 ellipse boundary drawing character
-		       * Changed "Holer" to "Canvas", and wrote AutoCanvas(),
-		         which allow one to use the visual-block drawing
-			 maps without creating a canvas first.
-		       * DrawIt now uses the ctrl-leftmouse to move a visual
-		         block selected region.
-		       * Floods can now be done inside an ellipse
-		       * DrawIt's maps are now all users of <buffer>
-	7 Feb 16, 2005 * now checks that "m" is in &go before attempting to
-	                 use menus
-	  Aug 17, 2005 * report option workaround
-	  Nov 01, 2005 * converted DrawIt to use autoload feature of vim 7.0
-	  Dec 28, 2005 * now uses cecutil to save/restore user maps
-	  Jan 18, 2006 * cecutil now updated to use keepjumps
-	  Jan 23, 2006 * :DIstart and :DIstop commands provided; thus users
-	                 using  "set noremap" can still use DrawIt.
-	  Jan 26, 2006 * DrawIt menu entry now keeps its place
-	  Apr 10, 2006 * Brushes were implemented
-	6 Feb 24, 2003 * The latest DrawIt now provides a fill function.
-			\f will ask for a character to fill the figure
-			surrounding the current cursor location.  Plus
-			I suggest reading :he drawit-tip for those whose
-			home/pageup/pagedown/end keys aren't all working
-			properly with DrawIt.
-	  08/18/03     : \p[a-z] and \r[a-z] implemented
-	  08/04/03     : b:..keep variables renamed to b:di_..keep variables
-	                 StopDrawIt() now insures that erase mode is off
-	  03/11/03     : included g:drawit_insertmode handling
-	  02/21/03     : included flood function
-	  12/11/02     : deletes trailing whitespace only if holer used
-	   8/27/02     : fat arrowheads included
-	               : shift-arrow keys move but don't modify
+	   Mar 24, 2009 * :DrawIt starts, :DrawIt! stops DrawIt mode.
+	   Mar 24, 2009 * I've included <script> modifiers to the maps to
+	                  cause rhs remapping only with mappings local to
+			  the script (see |:map-script|)
+	09 Sep 14, 2007 * Johann-Guenter Simon fixed a bug with s:DrawErase();
+	                  it called SetDrawIt() and that call hadn't been
+			  updated to account for the new b:di_ellipse
+			  parameter.
+	08 Feb 12, 2007 * fixed a bug which prevented multi-character user
+	                  maps from being restored properly
+	   May 03, 2007 * Extended SetDrawIt() to handle b:di_ellipse, the
+	                  ellipse boundary drawing character
+			* Changed "Holer" to "Canvas", and wrote AutoCanvas(),
+			  which allows one to use the visual-block drawing
+			  maps without creating a canvas first.
+			* DrawIt now uses the ctrl-leftmouse to move a visual
+			 block selected region.
+			* Floods can now be done inside an ellipse
+			* DrawIt's maps are now all users of <buffer>
+	 7 Feb 16, 2005 * now checks that "m" is in &go before attempting to
+			  use menus
+	  Aug 17, 2005  * report option workaround
+	  Nov 01, 2005  * converted DrawIt to use autoload feature of vim 7.0
+	  Dec 28, 2005  * now uses cecutil to save/restore user maps
+	  Jan 18, 2006  * cecutil now updated to use keepjumps
+	  Jan 23, 2006  * :DIstart and :DIstop commands provided; thus users
+			  using  "set noremap" can still use DrawIt.
+	  Jan 26, 2006  * DrawIt menu entry now keeps its place
+	  Apr 10, 2006  * Brushes were implemented
+	 6 Feb 24, 2003 * The latest DrawIt now provides a fill function.
+			  \f will ask for a character to fill the figure
+			  surrounding the current cursor location.  Plus
+			  I suggest reading :he drawit-tip for those whose
+			  home/pageup/pagedown/end keys aren't all working
+			  properly with DrawIt.
+	   08/18/03     : \p[a-z] and \r[a-z] implemented
+	   08/04/03     : b:..keep variables renamed to b:di_..keep variables
+	                  StopDrawIt() now insures that erase mode is off
+	   03/11/03     : included g:drawit_insertmode handling
+	   02/21/03     : included flood function
+	   12/11/02     : deletes trailing whitespace only if holer used
+	    8/27/02     : fat arrowheads included
+	                : shift-arrow keys move but don't modify
 
  ---------------------------------------------------------------------
 vim:tw=78:ts=8:ft=help:fdm=marker
diff --git a/plugin/DrawItPlugin.vim b/plugin/DrawItPlugin.vim
index 1281e81..2bff627 100644
--- a/plugin/DrawItPlugin.vim
+++ b/plugin/DrawItPlugin.vim
@@ -5,9 +5,9 @@
 "             You may also use visual-block mode to select endpoints and
 "             draw lines, arrows, and ellipses.
 "
-" Date:			May 20, 2008
+" Date:			Feb 22, 2011
 " Maintainer:	Charles E. Campbell, Jr.  <NdrOchipS@PcampbellAfamily.Mbiz>
-" Copyright:    Copyright (C) 1999-2005 Charles E. Campbell, Jr. {{{1
+" Copyright:    Copyright (C) 1999-2010 Charles E. Campbell, Jr. {{{1
 "               Permission is hereby granted to use and distribute this code,
 "               with or without modifications, provided that this copyright
 "               notice is copied with it. Like anything else that's free,
@@ -31,19 +31,10 @@
 if &cp || exists("g:loaded_DrawItPlugin")
  finish
 endif
-let g:loaded_DrawItPlugin = "v10"
+let g:loaded_DrawItPlugin = "v11k"
 let s:keepcpo             = &cpo
 set cpo&vim
 
-" ---------------------------------------------------------------------
-" DrChip Menu Support: {{{1
-if has("gui_running") && has("menu") && &go =~ 'm'
- if !exists("g:DrChipTopLvlMenu")
-  let g:DrChipTopLvlMenu= "DrChip."
- endif
- exe 'menu '.g:DrChipTopLvlMenu.'DrawIt.Start\ DrawIt<tab>\\di		<Leader>di'
-endif
-
 " ---------------------------------------------------------------------
 " Public Interface: {{{1
 if !hasmapto('<Plug>StartDrawIt')
@@ -51,6 +42,7 @@ if !hasmapto('<Plug>StartDrawIt')
 endif
 map <silent> <Plug>StartDrawIt  :set lz<cr>:call DrawIt#StartDrawIt()<cr>:set nolz<cr>
 com! -nargs=0 DIstart set lz|call DrawIt#StartDrawIt()|set nolz
+com! -nargs=0 -bang DrawIt set lz|if <bang>0|call DrawIt#StopDrawIt()|else|call DrawIt#StartDrawIt()|endif|set nolz
 
 if !hasmapto('<Plug>StopDrawIt')
   map <unique> <Leader>ds <Plug>StopDrawIt
@@ -58,6 +50,15 @@ endif
 map <silent> <Plug>StopDrawIt :set lz<cr>:call DrawIt#StopDrawIt()<cr>:set nolz<cr>
 com! -nargs=0 DIstop set lz|call DrawIt#StopDrawIt()|set nolz
 
+" ---------------------------------------------------------------------
+" DrChip Menu Support: {{{1
+if has("gui_running") && has("menu") && &go =~# 'm'
+ if !exists("g:DrChipTopLvlMenu")
+  let g:DrChipTopLvlMenu= "DrChip."
+ endif
+ exe 'menu '.g:DrChipTopLvlMenu.'DrawIt.Start\ DrawIt<tab>\\di		<Leader>di'
+endif
+
 " ---------------------------------------------------------------------
 "  Cleanup And Modelines:
 "  vim: fdm=marker
diff --git a/plugin/cecutil.vim b/plugin/cecutil.vim
index 506b7bf..e45e798 100644
--- a/plugin/cecutil.vim
+++ b/plugin/cecutil.vim
@@ -2,8 +2,8 @@
 "               save/restore mark position
 "               save/restore selected user maps
 "  Author:	Charles E. Campbell, Jr.
-"  Version:	17
-"  Date:	Sep 04, 2007
+"  Version:	18h	ASTRO-ONLY
+"  Date:	Apr 05, 2010
 "
 "  Saving Restoring Destroying Marks: {{{1
 "       call SaveMark(markname)       let savemark= SaveMark(markname)
@@ -27,20 +27,23 @@
 " You believe that God is one. You do well. The demons also {{{1
 " believe, and shudder. But do you want to know, vain man, that
 " faith apart from works is dead?  (James 2:19,20 WEB)
+"redraw!|call inputsave()|call input("Press <cr> to continue")|call inputrestore()
 
+" ---------------------------------------------------------------------
 " Load Once: {{{1
 if &cp || exists("g:loaded_cecutil")
  finish
 endif
-let g:loaded_cecutil = "v17"
+let g:loaded_cecutil = "v18h"
 let s:keepcpo        = &cpo
 set cpo&vim
-"DechoVarOn
+"DechoRemOn
 
-" -----------------------
+" =======================
 "  Public Interface: {{{1
-" -----------------------
+" =======================
 
+" ---------------------------------------------------------------------
 "  Map Interface: {{{2
 if !hasmapto('<Plug>SaveWinPosn')
  map <unique> <Leader>swp <Plug>SaveWinPosn
@@ -51,43 +54,56 @@ endif
 nmap <silent> <Plug>SaveWinPosn		:call SaveWinPosn()<CR>
 nmap <silent> <Plug>RestoreWinPosn	:call RestoreWinPosn()<CR>
 
+" ---------------------------------------------------------------------
 " Command Interface: {{{2
 com! -bar -nargs=0 SWP	call SaveWinPosn()
-com! -bar -nargs=0 RWP	call RestoreWinPosn()
+com! -bar -nargs=? RWP	call RestoreWinPosn(<args>)
 com! -bar -nargs=1 SM	call SaveMark(<q-args>)
 com! -bar -nargs=1 RM	call RestoreMark(<q-args>)
 com! -bar -nargs=1 DM	call DestroyMark(<q-args>)
 
+com! -bar -nargs=1 WLR	call s:WinLineRestore(<q-args>)
+
 if v:version < 630
- let s:modifier= "sil "
+ let s:modifier= "sil! "
 else
- let s:modifier= "sil keepj "
+ let s:modifier= "sil! keepj "
 endif
 
+" ===============
+" Functions: {{{1
+" ===============
+
 " ---------------------------------------------------------------------
-" SaveWinPosn: {{{1
+" SaveWinPosn: {{{2
 "    let winposn= SaveWinPosn()  will save window position in winposn variable
 "    call SaveWinPosn()          will save window position in b:cecutil_winposn{b:cecutil_iwinposn}
 "    let winposn= SaveWinPosn(0) will *only* save window position in winposn variable (no stacking done)
 fun! SaveWinPosn(...)
-"  call Dfunc("SaveWinPosn() a:0=".a:0)
-  if line(".") == 1 && getline(1) == ""
-"   call Dfunc("SaveWinPosn : empty buffer")
+"  echomsg "Decho: SaveWinPosn() a:0=".a:0
+  if line("$") == 1 && getline(1) == ""
+"   echomsg "Decho: SaveWinPosn : empty buffer"
    return ""
   endif
-  let so_keep   = &so
+  let so_keep   = &l:so
   let siso_keep = &siso
-  let ss_keep   = &ss
-  set so=0 siso=0 ss=0
-
-  let swline    = line(".")
-  let swcol     = col(".")
-  let swwline   = winline() - 1
-  let swwcol    = virtcol(".") - wincol()
-  let savedposn = "call GoWinbufnr(".winbufnr(0).")|silent ".swline
+  let ss_keep   = &l:ss
+  setlocal so=0 siso=0 ss=0
+
+  let swline = line(".")                           " save-window line in file
+  let swcol  = col(".")                            " save-window column in file
+  if swcol >= col("$")
+   let swcol= swcol + virtcol(".") - virtcol("$")  " adjust for virtual edit (cursor past end-of-line)
+  endif
+  let swwline   = winline() - 1                    " save-window window line
+  let swwcol    = virtcol(".") - wincol()          " save-window window column
+  let savedposn = ""
+"  echomsg "Decho: sw[".swline.",".swcol."] sww[".swwline.",".swwcol."]"
+  let savedposn = "call GoWinbufnr(".winbufnr(0).")"
+  let savedposn = savedposn."|".s:modifier.swline
   let savedposn = savedposn."|".s:modifier."norm! 0z\<cr>"
   if swwline > 0
-   let savedposn= savedposn.":".s:modifier."norm! ".swwline."\<c-y>\<cr>"
+   let savedposn= savedposn.":".s:modifier."call s:WinLineRestore(".(swwline+1).")\<cr>"
   endif
   if swwcol > 0
    let savedposn= savedposn.":".s:modifier."norm! 0".swwcol."zl\<cr>"
@@ -99,54 +115,56 @@ fun! SaveWinPosn(...)
   " only when SaveWinPosn() is used
   if a:0 == 0
    if !exists("b:cecutil_iwinposn")
-   	let b:cecutil_iwinposn= 1
+	let b:cecutil_iwinposn= 1
    else
-   	let b:cecutil_iwinposn= b:cecutil_iwinposn + 1
+	let b:cecutil_iwinposn= b:cecutil_iwinposn + 1
    endif
-"   call Decho("saving posn to SWP stack")
+"   echomsg "Decho: saving posn to SWP stack"
    let b:cecutil_winposn{b:cecutil_iwinposn}= savedposn
   endif
 
-  let &so   = so_keep
+  let &l:so = so_keep
   let &siso = siso_keep
-  let &ss   = ss_keep
-
-"  if exists("b:cecutil_iwinposn")	 " Decho
-"   call Decho("b:cecutil_winpos{".b:cecutil_iwinposn."}[".b:cecutil_winposn{b:cecutil_iwinposn}."]")
-"  else                      " Decho
-"   call Decho("b:cecutil_iwinposn doesn't exist")
-"  endif                     " Decho
-"  call Dret("SaveWinPosn [".savedposn."]")
+  let &l:ss = ss_keep
+
+"  if exists("b:cecutil_iwinposn")                                                                  " Decho
+"   echomsg "Decho: b:cecutil_winpos{".b:cecutil_iwinposn."}[".b:cecutil_winposn{b:cecutil_iwinposn}."]"
+"  else                                                                                             " Decho
+"   echomsg "Decho: b:cecutil_iwinposn doesn't exist"
+"  endif                                                                                            " Decho
+"  echomsg "Decho: SaveWinPosn [".savedposn."]"
   return savedposn
 endfun
 
 " ---------------------------------------------------------------------
-" RestoreWinPosn: {{{1
+" RestoreWinPosn: {{{2
+"      call RestoreWinPosn()
+"      call RestoreWinPosn(winposn)
 fun! RestoreWinPosn(...)
-"  call Dfunc("RestoreWinPosn() a:0=".a:0)
-"  call Decho("getline(1)<".getline(1).">")
-"  call Decho("line(.)=".line("."))
-  if line(".") == 1 && getline(1) == ""
-"   call Dfunc("RestoreWinPosn : empty buffer")
+"  echomsg "Decho: RestoreWinPosn() a:0=".a:0
+"  echomsg "Decho: getline(1)<".getline(1).">"
+"  echomsg "Decho: line(.)=".line(".")
+  if line("$") == 1 && getline(1) == ""
+"   echomsg "Decho: RestoreWinPosn : empty buffer"
    return ""
   endif
-  let so_keep   = &so
-  let siso_keep = &siso
-  let ss_keep   = &ss
-  set so=0 siso=0 ss=0
+  let so_keep   = &l:so
+  let siso_keep = &l:siso
+  let ss_keep   = &l:ss
+  setlocal so=0 siso=0 ss=0
 
   if a:0 == 0 || a:1 == ""
    " use saved window position in b:cecutil_winposn{b:cecutil_iwinposn} if it exists
    if exists("b:cecutil_iwinposn") && exists("b:cecutil_winposn{b:cecutil_iwinposn}")
-"   	call Decho("using stack b:cecutil_winposn{".b:cecutil_iwinposn."}<".b:cecutil_winposn{b:cecutil_iwinposn}.">")
+"    echomsg "Decho: using stack b:cecutil_winposn{".b:cecutil_iwinposn."}<".b:cecutil_winposn{b:cecutil_iwinposn}.">"
 	try
-     exe "silent! ".b:cecutil_winposn{b:cecutil_iwinposn}
+	 exe s:modifier.b:cecutil_winposn{b:cecutil_iwinposn}
 	catch /^Vim\%((\a\+)\)\=:E749/
 	 " ignore empty buffer error messages
 	endtry
-    " normally drop top-of-stack by one
-    " but while new top-of-stack doesn't exist
-    " drop top-of-stack index by one again
+	" normally drop top-of-stack by one
+	" but while new top-of-stack doesn't exist
+	" drop top-of-stack index by one again
 	if b:cecutil_iwinposn >= 1
 	 unlet b:cecutil_winposn{b:cecutil_iwinposn}
 	 let b:cecutil_iwinposn= b:cecutil_iwinposn - 1
@@ -158,49 +176,68 @@ fun! RestoreWinPosn(...)
 	 endif
 	endif
    else
-   	echohl WarningMsg
+	echohl WarningMsg
 	echomsg "***warning*** need to SaveWinPosn first!"
 	echohl None
    endif
 
   else	 " handle input argument
-"   call Decho("using input a:1<".a:1.">")
+"   echomsg "Decho: using input a:1<".a:1.">"
    " use window position passed to this function
-   exe "silent ".a:1
+   exe a:1
    " remove a:1 pattern from b:cecutil_winposn{b:cecutil_iwinposn} stack
    if exists("b:cecutil_iwinposn")
-    let jwinposn= b:cecutil_iwinposn
-    while jwinposn >= 1                     " search for a:1 in iwinposn..1
-        if exists("b:cecutil_winposn{jwinposn}")    " if it exists
-         if a:1 == b:cecutil_winposn{jwinposn}      " and the pattern matches
-       unlet b:cecutil_winposn{jwinposn}            " unlet it
-       if jwinposn == b:cecutil_iwinposn            " if at top-of-stack
-        let b:cecutil_iwinposn= b:cecutil_iwinposn - 1      " drop stacktop by one
-       endif
-      endif
-     endif
-     let jwinposn= jwinposn - 1
-    endwhile
+	let jwinposn= b:cecutil_iwinposn
+	while jwinposn >= 1                     " search for a:1 in iwinposn..1
+	 if exists("b:cecutil_winposn{jwinposn}")    " if it exists
+	  if a:1 == b:cecutil_winposn{jwinposn}      " and the pattern matches
+	   unlet b:cecutil_winposn{jwinposn}            " unlet it
+	   if jwinposn == b:cecutil_iwinposn            " if at top-of-stack
+		let b:cecutil_iwinposn= b:cecutil_iwinposn - 1      " drop stacktop by one
+	   endif
+	  endif
+	 endif
+	 let jwinposn= jwinposn - 1
+	endwhile
    endif
   endif
 
-  " seems to be something odd: vertical motions after RWP
-  " cause jump to first column.  Following fixes that
-  if wincol() > 1
-   silent norm! hl
+  " Seems to be something odd: vertical motions after RWP
+  " cause jump to first column.  The following fixes that.
+  " Note: was using wincol()>1, but with signs, a cursor
+  " at column 1 yields wincol()==3.  Beeping ensued.
+  let vekeep= &ve
+  set ve=all
+  if virtcol('.') > 1
+   exe s:modifier."norm! hl"
   elseif virtcol(".") < virtcol("$")
-   silent norm! lh
+   exe s:modifier."norm! lh"
   endif
+  let &ve= vekeep
 
-  let &so   = so_keep
-  let &siso = siso_keep
-  let &ss   = ss_keep
+  let &l:so   = so_keep
+  let &l:siso = siso_keep
+  let &l:ss   = ss_keep
 
-"  call Dret("RestoreWinPosn")
+"  echomsg "Decho: RestoreWinPosn"
 endfun
 
 " ---------------------------------------------------------------------
-" GoWinbufnr: go to window holding given buffer (by number) {{{1
+" s:WinLineRestore: {{{2
+fun! s:WinLineRestore(swwline)
+"  echomsg "Decho: s:WinLineRestore(swwline=".a:swwline.")"
+  while winline() < a:swwline
+   let curwinline= winline()
+   exe s:modifier."norm! \<c-y>"
+   if curwinline == winline()
+	break
+   endif
+  endwhile
+"  echomsg "Decho: s:WinLineRestore"
+endfun
+
+" ---------------------------------------------------------------------
+" GoWinbufnr: go to window holding given buffer (by number) {{{2
 "   Prefers current window; if its buffer number doesn't match,
 "   then will try from topleft to bottom right
 fun! GoWinbufnr(bufnum)
@@ -219,7 +256,7 @@ fun! GoWinbufnr(bufnum)
 endfun
 
 " ---------------------------------------------------------------------
-" SaveMark: sets up a string saving a mark position. {{{1
+" SaveMark: sets up a string saving a mark position. {{{2
 "           For example, SaveMark("a")
 "           Also sets up a global variable, g:savemark_{markname}
 fun! SaveMark(markname)
@@ -252,7 +289,7 @@ fun! SaveMark(markname)
 endfun
 
 " ---------------------------------------------------------------------
-" RestoreMark: {{{1
+" RestoreMark: {{{2
 "   call RestoreMark("a")  -or- call RestoreMark(savemark)
 fun! RestoreMark(markname)
 "  call Dfunc("RestoreMark(markname<".a:markname.">)")
@@ -294,7 +331,7 @@ fun! RestoreMark(markname)
 endfun
 
 " ---------------------------------------------------------------------
-" DestroyMark: {{{1
+" DestroyMark: {{{2
 "   call DestroyMark("a")  -- destroys mark
 fun! DestroyMark(markname)
 "  call Dfunc("DestroyMark(markname<".a:markname.">)")
@@ -329,7 +366,7 @@ fun! DestroyMark(markname)
 endfun
 
 " ---------------------------------------------------------------------
-" QArgSplitter: to avoid \ processing by <f-args>, <q-args> is needed. {{{1
+" QArgSplitter: to avoid \ processing by <f-args>, <q-args> is needed. {{{2
 " However, <q-args> doesn't split at all, so this one returns a list
 " with splits at all whitespace (only!), plus a leading length-of-list.
 " The resulting list:  qarglist[0] corresponds to a:0
@@ -344,7 +381,7 @@ fun! QArgSplitter(qarg)
 endfun
 
 " ---------------------------------------------------------------------
-" ListWinPosn:
+" ListWinPosn: {{{2
 "fun! ListWinPosn()                                                        " Decho 
 "  if !exists("b:cecutil_iwinposn") || b:cecutil_iwinposn == 0             " Decho 
 "   call Decho("nothing on SWP stack")                                     " Decho
@@ -363,14 +400,19 @@ endfun
 "com! -nargs=0 LWP	call ListWinPosn()                                    " Decho 
 
 " ---------------------------------------------------------------------
-" SaveUserMaps: this function sets up a script-variable (s:restoremap) {{{1
+" SaveUserMaps: this function sets up a script-variable (s:restoremap) {{{2
 "          which can be used to restore user maps later with
 "          call RestoreUserMaps()
 "
-"          mapmode - see :help maparg for its list
+"          mapmode - see :help maparg for details (n v o i c l "")
 "                    ex. "n" = Normal
-"                    If the first letter is u, then unmapping will be done
-"                    ex. "un" = Normal + unmapping
+"                    The letters "b" and "u" are optional prefixes;
+"                    The "u" means that the map will also be unmapped
+"                    The "b" means that the map has a <buffer> qualifier
+"                    ex. "un"  = Normal + unmapping
+"                    ex. "bn"  = Normal + <buffer>
+"                    ex. "bun" = Normal + <buffer> + unmapping
+"                    ex. "ubn" = Normal + <buffer> + unmapping
 "          maplead - see mapchx
 "          mapchx  - "<something>" handled as a single map item.
 "                    ex. "<left>"
@@ -395,60 +437,70 @@ fun! SaveUserMaps(mapmode,maplead,mapchx,suffix)
 
   " set up dounmap: if 1, then save and unmap  (a:mapmode leads with a "u")
   "                 if 0, save only
-  if a:mapmode =~ '^u'
-   let dounmap= 1
-   let mapmode= strpart(a:mapmode,1)
-  else
-   let dounmap= 0
-   let mapmode= a:mapmode
-  endif
+  let mapmode  = a:mapmode
+  let dounmap  = 0
+  let dobuffer = ""
+  while mapmode =~ '^[bu]'
+   if     mapmode =~ '^u'
+    let dounmap = 1
+    let mapmode = strpart(a:mapmode,1)
+   elseif mapmode =~ '^b'
+    let dobuffer = "<buffer> "
+    let mapmode  = strpart(a:mapmode,1)
+   endif
+  endwhile
+"  call Decho("dounmap=".dounmap."  dobuffer<".dobuffer.">")
  
   " save single map :...something...
   if strpart(a:mapchx,0,1) == ':'
+"   call Decho("save single map :...something...")
    let amap= strpart(a:mapchx,1)
    if amap == "|" || amap == "\<c-v>"
     let amap= "\<c-v>".amap
    endif
    let amap                    = a:maplead.amap
-   let s:restoremap_{a:suffix} = s:restoremap_{a:suffix}."|:silent! ".mapmode."unmap ".amap
+   let s:restoremap_{a:suffix} = s:restoremap_{a:suffix}."|:silent! ".mapmode."unmap ".dobuffer.amap
    if maparg(amap,mapmode) != ""
     let maprhs                  = substitute(maparg(amap,mapmode),'|','<bar>','ge')
-   	let s:restoremap_{a:suffix} = s:restoremap_{a:suffix}."|:".mapmode."map ".amap." ".maprhs
+	let s:restoremap_{a:suffix} = s:restoremap_{a:suffix}."|:".mapmode."map ".dobuffer.amap." ".maprhs
    endif
    if dounmap
-    exe "silent! ".mapmode."unmap ".amap
+	exe "silent! ".mapmode."unmap ".dobuffer.amap
    endif
  
   " save single map <something>
   elseif strpart(a:mapchx,0,1) == '<'
+"   call Decho("save single map <something>")
    let amap       = a:mapchx
    if amap == "|" || amap == "\<c-v>"
     let amap= "\<c-v>".amap
+"	call Decho("amap[[".amap."]]")
    endif
-   let s:restoremap_{a:suffix} = s:restoremap_{a:suffix}."|silent! ".mapmode."unmap ".amap
+   let s:restoremap_{a:suffix} = s:restoremap_{a:suffix}."|silent! ".mapmode."unmap ".dobuffer.amap
    if maparg(a:mapchx,mapmode) != ""
     let maprhs                  = substitute(maparg(amap,mapmode),'|','<bar>','ge')
-   	let s:restoremap_{a:suffix} = s:restoremap_{a:suffix}."|".mapmode."map ".amap." ".maprhs
+	let s:restoremap_{a:suffix} = s:restoremap_{a:suffix}."|".mapmode."map ".dobuffer.amap." ".maprhs
    endif
    if dounmap
-    exe "silent! ".mapmode."unmap ".amap
+	exe "silent! ".mapmode."unmap ".dobuffer.amap
    endif
  
   " save multiple maps
   else
+"   call Decho("save multiple maps")
    let i= 1
    while i <= strlen(a:mapchx)
     let amap= a:maplead.strpart(a:mapchx,i-1,1)
 	if amap == "|" || amap == "\<c-v>"
 	 let amap= "\<c-v>".amap
 	endif
-    let s:restoremap_{a:suffix} = s:restoremap_{a:suffix}."|silent! ".mapmode."unmap ".amap
+	let s:restoremap_{a:suffix} = s:restoremap_{a:suffix}."|silent! ".mapmode."unmap ".dobuffer.amap
     if maparg(amap,mapmode) != ""
      let maprhs                  = substitute(maparg(amap,mapmode),'|','<bar>','ge')
-   	 let s:restoremap_{a:suffix} = s:restoremap_{a:suffix}."|".mapmode."map ".amap." ".maprhs
+	 let s:restoremap_{a:suffix} = s:restoremap_{a:suffix}."|".mapmode."map ".dobuffer.amap." ".maprhs
     endif
 	if dounmap
-     exe "silent! ".mapmode."unmap ".amap
+	 exe "silent! ".mapmode."unmap ".dobuffer.amap
 	endif
     let i= i + 1
    endwhile
@@ -457,7 +509,7 @@ fun! SaveUserMaps(mapmode,maplead,mapchx,suffix)
 endfun
 
 " ---------------------------------------------------------------------
-" RestoreUserMaps: {{{1
+" RestoreUserMaps: {{{2
 "   Used to restore user maps saved by SaveUserMaps()
 fun! RestoreUserMaps(suffix)
 "  call Dfunc("RestoreUserMaps(suffix<".a:suffix.">)")
@@ -472,11 +524,13 @@ fun! RestoreUserMaps(suffix)
 "  call Dret("RestoreUserMaps")
 endfun
 
-" ---------------------------------------------------------------------
+" ==============
 "  Restore: {{{1
+" ==============
 let &cpo= s:keepcpo
 unlet s:keepcpo
 
-" ---------------------------------------------------------------------
+" ================
 "  Modelines: {{{1
+" ================
 " vim: ts=4 fdm=marker