From ff10d22be3d79668bfef72f7314a82a6545dcfab Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Sep 11 2006 09:33:41 +0000 Subject: - Patchlevel 89 --- diff --git a/7.0.089 b/7.0.089 new file mode 100644 index 0000000..f314286 --- /dev/null +++ b/7.0.089 @@ -0,0 +1,97 @@ +To: vim-dev@vim.org +Subject: Patch 7.0.089 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=ISO-8859-1 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.0.089 +Problem: "ga" does not work properly for a non-Unicode multi-byte encoding. +Solution: Only check for composing chars for utf-8. (Taro Muraoka) +Files: src/ex_cmds.c + + +*** ../vim-7.0.088/src/ex_cmds.c Tue Sep 5 16:29:38 2006 +--- src/ex_cmds.c Tue Sep 5 18:12:41 2006 +*************** +*** 95,101 **** + _("<%s>%s%s %d, Hex %02x, Octal %03o"), + transchar(c), buf1, buf2, c, c, c); + #ifdef FEAT_MBYTE +! c = cc[ci++]; + #endif + } + +--- 95,104 ---- + _("<%s>%s%s %d, Hex %02x, Octal %03o"), + transchar(c), buf1, buf2, c, c, c); + #ifdef FEAT_MBYTE +! if (enc_utf8) +! c = cc[ci++]; +! else +! c = 0; + #endif + } + +*************** +*** 108,114 **** + if (len > 0) + IObuff[len++] = ' '; + IObuff[len++] = '<'; +! if (utf_iscomposing(c) + # ifdef USE_GUI + && !gui.in_use + # endif +--- 111,117 ---- + if (len > 0) + IObuff[len++] = ' '; + IObuff[len++] = '<'; +! if (enc_utf8 && utf_iscomposing(c) + # ifdef USE_GUI + && !gui.in_use + # endif +*************** +*** 120,126 **** + : _("> %d, Hex %08x, Octal %o"), c, c, c); + if (ci == MAX_MCO) + break; +! c = cc[ci++]; + } + #endif + +--- 123,132 ---- + : _("> %d, Hex %08x, Octal %o"), c, c, c); + if (ci == MAX_MCO) + break; +! if (enc_utf8) +! c = cc[ci++]; +! else +! c = 0; + } + #endif + +*** ../vim-7.0.088/src/version.c Tue Sep 5 17:30:25 2006 +--- src/version.c Tue Sep 5 18:19:42 2006 +*************** +*** 668,669 **** +--- 668,671 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 89, + /**/ + +-- + [clop clop] +GUARD #1: Halt! Who goes there? +ARTHUR: It is I, Arthur, son of Uther Pendragon, from the castle of + Camelot. King of the Britons, defeator of the Saxons, sovereign of + all England! +GUARD #1: Pull the other one! + The Quest for the Holy Grail (Monty Python) + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ download, build and distribute -- http://www.A-A-P.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org ///