|
 |
aa62ad0 |
To: vim-dev@vim.org
|
|
|
aa62ad0 |
Subject: Patch 7.3.006
|
|
|
aa62ad0 |
Fcc: outbox
|
|
|
aa62ad0 |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
aa62ad0 |
Mime-Version: 1.0
|
|
|
aa62ad0 |
Content-Type: text/plain; charset=UTF-8
|
|
|
aa62ad0 |
Content-Transfer-Encoding: 8bit
|
|
|
aa62ad0 |
------------
|
|
|
aa62ad0 |
|
|
|
aa62ad0 |
Patch 7.3.006
|
|
|
aa62ad0 |
Problem: Can't build some multi-byte code with C89.
|
|
|
aa62ad0 |
Solution: Move code to after declarations. (Joachim Schmitz)
|
|
|
aa62ad0 |
Files: src/mbyte.c, src/spell.c
|
|
|
aa62ad0 |
|
|
|
aa62ad0 |
|
|
|
aa62ad0 |
*** ../vim-7.3.005/src/mbyte.c 2010-08-15 21:57:28.000000000 +0200
|
|
|
aa62ad0 |
--- src/mbyte.c 2010-09-18 13:32:40.000000000 +0200
|
|
|
aa62ad0 |
***************
|
|
|
aa62ad0 |
*** 5167,5182 ****
|
|
|
aa62ad0 |
void
|
|
|
aa62ad0 |
xim_set_preedit()
|
|
|
aa62ad0 |
{
|
|
|
aa62ad0 |
- if (xic == NULL)
|
|
|
aa62ad0 |
- return;
|
|
|
aa62ad0 |
-
|
|
|
aa62ad0 |
- xim_set_focus(TRUE);
|
|
|
aa62ad0 |
-
|
|
|
aa62ad0 |
XVaNestedList attr_list;
|
|
|
aa62ad0 |
XRectangle spot_area;
|
|
|
aa62ad0 |
XPoint over_spot;
|
|
|
aa62ad0 |
int line_space;
|
|
|
aa62ad0 |
|
|
|
aa62ad0 |
if (!xim_has_focus)
|
|
|
aa62ad0 |
{
|
|
|
aa62ad0 |
/* hide XIM cursor */
|
|
|
aa62ad0 |
--- 5167,5182 ----
|
|
|
aa62ad0 |
void
|
|
|
aa62ad0 |
xim_set_preedit()
|
|
|
aa62ad0 |
{
|
|
|
aa62ad0 |
XVaNestedList attr_list;
|
|
|
aa62ad0 |
XRectangle spot_area;
|
|
|
aa62ad0 |
XPoint over_spot;
|
|
|
aa62ad0 |
int line_space;
|
|
|
aa62ad0 |
|
|
|
aa62ad0 |
+ if (xic == NULL)
|
|
|
aa62ad0 |
+ return;
|
|
|
aa62ad0 |
+
|
|
|
aa62ad0 |
+ xim_set_focus(TRUE);
|
|
|
aa62ad0 |
+
|
|
|
aa62ad0 |
if (!xim_has_focus)
|
|
|
aa62ad0 |
{
|
|
|
aa62ad0 |
/* hide XIM cursor */
|
|
|
aa62ad0 |
***************
|
|
|
aa62ad0 |
*** 5554,5565 ****
|
|
|
aa62ad0 |
void
|
|
|
aa62ad0 |
xim_set_status_area()
|
|
|
aa62ad0 |
{
|
|
|
aa62ad0 |
- if (xic == NULL)
|
|
|
aa62ad0 |
- return;
|
|
|
aa62ad0 |
-
|
|
|
aa62ad0 |
XVaNestedList preedit_list = 0, status_list = 0, list = 0;
|
|
|
aa62ad0 |
XRectangle pre_area, status_area;
|
|
|
aa62ad0 |
|
|
|
aa62ad0 |
if (input_style & XIMStatusArea)
|
|
|
aa62ad0 |
{
|
|
|
aa62ad0 |
if (input_style & XIMPreeditArea)
|
|
|
aa62ad0 |
--- 5554,5565 ----
|
|
|
aa62ad0 |
void
|
|
|
aa62ad0 |
xim_set_status_area()
|
|
|
aa62ad0 |
{
|
|
|
aa62ad0 |
XVaNestedList preedit_list = 0, status_list = 0, list = 0;
|
|
|
aa62ad0 |
XRectangle pre_area, status_area;
|
|
|
aa62ad0 |
|
|
|
aa62ad0 |
+ if (xic == NULL)
|
|
|
aa62ad0 |
+ return;
|
|
|
aa62ad0 |
+
|
|
|
aa62ad0 |
if (input_style & XIMStatusArea)
|
|
|
aa62ad0 |
{
|
|
|
aa62ad0 |
if (input_style & XIMPreeditArea)
|
|
|
aa62ad0 |
*** ../vim-7.3.005/src/spell.c 2010-08-15 21:57:32.000000000 +0200
|
|
|
aa62ad0 |
--- src/spell.c 2010-09-18 13:34:11.000000000 +0200
|
|
|
aa62ad0 |
***************
|
|
|
aa62ad0 |
*** 4679,4685 ****
|
|
|
aa62ad0 |
buf_T *buf;
|
|
|
aa62ad0 |
char_u fname[MAXPATHL];
|
|
|
aa62ad0 |
|
|
|
aa62ad0 |
! /* Go through all buffers and handle 'spelllang'. */ //<VN>
|
|
|
aa62ad0 |
for (buf = firstbuf; buf != NULL; buf = buf->b_next)
|
|
|
aa62ad0 |
ga_clear(&buf->b_s.b_langp);
|
|
|
aa62ad0 |
|
|
|
aa62ad0 |
--- 4679,4685 ----
|
|
|
aa62ad0 |
buf_T *buf;
|
|
|
aa62ad0 |
char_u fname[MAXPATHL];
|
|
|
aa62ad0 |
|
|
|
aa62ad0 |
! /* Go through all buffers and handle 'spelllang'. <VN> */
|
|
|
aa62ad0 |
for (buf = firstbuf; buf != NULL; buf = buf->b_next)
|
|
|
aa62ad0 |
ga_clear(&buf->b_s.b_langp);
|
|
|
aa62ad0 |
|
|
|
aa62ad0 |
*** ../vim-7.3.005/src/version.c 2010-09-14 12:47:30.000000000 +0200
|
|
|
aa62ad0 |
--- src/version.c 2010-09-18 13:34:23.000000000 +0200
|
|
|
aa62ad0 |
***************
|
|
|
aa62ad0 |
*** 716,717 ****
|
|
|
aa62ad0 |
--- 716,719 ----
|
|
|
aa62ad0 |
{ /* Add new patch number below this line */
|
|
|
aa62ad0 |
+ /**/
|
|
|
aa62ad0 |
+ 6,
|
|
|
aa62ad0 |
/**/
|
|
|
aa62ad0 |
|
|
|
aa62ad0 |
--
|
|
|
aa62ad0 |
hundred-and-one symptoms of being an internet addict:
|
|
|
aa62ad0 |
163. You go outside for the fresh air (at -30 degrees) but open the
|
|
|
aa62ad0 |
window first to hear new mail arrive.
|
|
|
aa62ad0 |
|
|
|
aa62ad0 |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
aa62ad0 |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
aa62ad0 |
\\\ download, build and distribute -- http://www.A-A-P.org ///
|
|
|
aa62ad0 |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|