This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# HG changeset patch | |
# Parent 3e9f602e3362e01b850845651357f0a6886d7875 | |
# Parent ce73d82e98a71a688494690978f4e8fe3cc010f6 | |
Add C/Migemo feature | |
diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak | |
index b2cc822..8ae8c9b 100644 | |
--- a/src/Make_mvc.mak | |
+++ b/src/Make_mvc.mak | |
@@ -697,6 +697,14 @@ GETTEXT = yes |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/src/search.c b/src/search.c | |
index 6248612..009b15d 100644 | |
--- a/src/search.c | |
+++ b/src/search.c | |
@@ -69,8 +69,16 @@ char *grow_buf_if_shortage(size_t *cur_buf_size, | |
char *new_buf; | |
if (*cur_buf_size < need_size + buf_offset + NMAX) { | |
*cur_buf_size += need_size + (NMAX - need_size % NMAX); | |
+ ptrdiff_t copy_buf_size; | |
+ size_t size; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
function! MigemoMatch(items, str, limit, mmode, ispath, crfile, regex) | |
if has('migmeo') | |
let tmp = tempname() | |
try | |
if a:str =~ '^\s*$' | |
return a:items | |
endif | |
call writefile(split(iconv(join(a:items, "\n"), &encoding, 'utf-8'), "\n"), tmp) | |
return split(iconv(system( | |
\ printf('migemogrep %s %s', |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# HG changeset patch | |
# Parent 0bd48fdc91a0c09734a99ab35b0dd76910a01314 | |
diff -r 0bd48fdc91a0 -r 04a27d7baf6f src/configure.in | |
--- a/src/configure.in Wed Apr 17 17:50:48 2013 +0900 | |
+++ b/src/configure.in Wed Apr 17 17:54:16 2013 +0900 | |
@@ -3591,7 +3591,8 @@ | |
if test "$enable_migemo" = "yes"; then | |
AC_MSG_RESULT(no) | |
AC_CHECK_LIB(migemo, migemo_open, | |
- [LIBS="$LIBS -lmigemo" AC_DEFINE(HAVE_MIGEMO)],,) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff -r 24b8a839fa25 src/screen.c | |
--- a/src/screen.c Sun Dec 07 00:04:48 2014 +0900 | |
+++ b/src/screen.c Sun Dec 07 01:00:02 2014 +0900 | |
@@ -2919,6 +2919,7 @@ | |
int mb_c = 0; /* decoded multi-byte character */ | |
int mb_utf8 = FALSE; /* screen char is UTF-8 char */ | |
int u8cc[MAX_MCO]; /* composing UTF-8 chars */ | |
+ int hl_len = 0; | |
#endif | |
#ifdef FEAT_DIFF |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff -r 661e95466448 src/screen.c | |
--- a/src/screen.c Sun Nov 23 15:57:49 2014 +0100 | |
+++ b/src/screen.c Wed Nov 26 14:19:18 2014 +0900 | |
@@ -2994,7 +2994,7 @@ | |
int syntax_flags = 0; | |
int syntax_seqnr = 0; | |
int prev_syntax_id = 0; | |
- int conceal_attr = hl_attr(HLF_CONCEAL); | |
+ int conceal_attr = 0; | |
int is_concealing = FALSE; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff -r e795caea4863 src/edit.c | |
--- a/src/edit.c Mon Apr 07 13:49:58 2014 +0900 | |
+++ b/src/edit.c Wed Apr 16 15:13:30 2014 +0900 | |
@@ -9333,12 +9333,7 @@ | |
tpos = curwin->w_cursor; | |
if (oneleft() == OK) | |
{ | |
-#if defined(FEAT_XIM) && defined(FEAT_GUI_GTK) | |
- /* Only call start_arrow() when not busy with preediting, it will | |
- * break undo. K_LEFT is inserted in im_correct_cursor(). */ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff -r a95f6c144df1 -r d593180027e1 src/fileio.c | |
--- a/src/fileio.c Tue Apr 23 16:39:20 2013 +0900 | |
+++ b/src/fileio.c Tue Apr 23 16:40:46 2013 +0900 | |
@@ -9353,6 +9353,9 @@ | |
#ifdef FEAT_INS_EXPAND | |
&& !ins_compl_active() | |
#endif | |
+#ifdef FEAT_XIM | |
+ && !im_is_preediting() | |
+#endif |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff -r 799a3e43b0b5 src/gui.c | |
--- a/src/gui.c Fri Jun 28 11:52:13 2013 +0900 | |
+++ b/src/gui.c Fri Jun 28 12:01:36 2013 +0900 | |
@@ -771,10 +771,6 @@ | |
gui_mch_disable_beval_area(balloonEval); | |
#endif | |
-#if defined(FEAT_XIM) && defined(FEAT_GUI_GTK) | |
- if (!im_xim_isvalid_imactivate()) | |
- EMSG(_("E599: Value of 'imactivatekey' is invalid")); |
NewerOlder