Hi,
On Tue, Jan 3, 2017 at 9:01 AM, Ken Takata <ktakata65...@gmail.com> wrote:
> I have updated the patch. Now, it includes tests.
> I think that the patch is ready to be included.
> @@ -713,6 +715,30 @@ qf_get_next_file_line(qfstate_T *state)
> else
> state->linebuf = IObuff;
>
> +#ifdef FEAT_MBYTE
> + /* Convert a line if it contains a non-ASCII character. */
> + if (state->vc->vc_type != CONV_NONE && has_non_ascii(state->linebuf)) {
> + char_u *line;
> +
> + line = string_convert(state->vc, state->linebuf, &state->linelen);
> + if (line != NULL)
> + {
> + if (state->linelen < IOSIZE)
> + {
> + STRCPY(state->linebuf, line);
> + vim_free(line);
Indenting looks off here.
> + }
> + else
> + {
> + vim_free(state->growbuf);
> + state->linebuf = state->growbuf = line;
> + state->growbufsiz = state->linelen < LINE_MAXLEN
> + ? state->linelen : LINE_MAXLEN;
> + }
and here...
> + }
> + }
> +#endif
> +
> @@ -1119,7 +1146,14 @@ qf_init_ext(
> static char_u *last_efm = NULL;
> int retval = -1; /* default: return error flag */
> int status;
> -
> +#ifdef FEAT_MBYTE
> + vimconv_T vc;
> +
> + vc.vc_type = CONV_NONE;
> + if (enc != NULL && *enc != NUL)
> + convert_setup(&vc, enc, p_enc);
Here as well (is it my viewer?? Ah! Mixed tabs and spaces! It isn't my
viewer after all! Are mixed spaces/tabs allowed in Vim source?)
> + state.vc = &vc;
> +#endif
> @@ -1286,6 +1320,10 @@ qf_init_end:
> #ifdef FEAT_WINDOWS
> qf_update_buffer(qi, old_last);
> #endif
> +#ifdef FEAT_MBYTE
> + if (vc.vc_type != CONV_NONE)
> + convert_setup(&vc, NULL, NULL);
> +#endif
Here as well.
> @@ -3464,6 +3503,18 @@ ex_make(exarg_T *eap)
> # endif
> }
> #endif
> +#ifdef FEAT_MBYTE
> + if ((eap->cmdidx != CMD_make) && (eap->cmdidx != CMD_lmake))
> + {
> + /* Use 'genc' for grep commands if it is set. */
> + if (*curbuf->b_p_genc != NUL)
> + enc = curbuf->b_p_genc;
> + else if (*p_genc != NUL)
> + enc = p_genc;
> + }
> + if (enc == NULL)
> + enc = (*curbuf->b_p_menc != NUL) ? curbuf->b_p_menc : p_menc;
> +#endif
...and here.
Christ van Willegen
--
09 F9 11 02 9D 74 E3 5B D8 41 56 C5 63 56 88 C0
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to vim_dev+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
