diff options
| author | Bram Moolenaar <Bram@vim.org> | 2006-03-17 23:10:44 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2006-03-17 23:10:44 +0000 |
| commit | a83c3e0ebd573c400e50340d2b85a94e5a0b204b (patch) | |
| tree | 91d67fdcdce0ba1cd6d9f86a1eb8b7ad11c5fe9f /src | |
| parent | ea0cd36bdd0cce5097a53113b626d73bd137b7ef (diff) | |
| download | vim-git-a83c3e0ebd573c400e50340d2b85a94e5a0b204b.tar.gz | |
updated for version 7.0227
Diffstat (limited to 'src')
| -rw-r--r-- | src/Make_mvc.mak | 2 | ||||
| -rw-r--r-- | src/normal.c | 6 | ||||
| -rw-r--r-- | src/os_vms.c | 18 | ||||
| -rw-r--r-- | src/testdir/test61.ok | 2 |
4 files changed, 16 insertions, 12 deletions
diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak index e569b9a83..dbebbd789 100644 --- a/src/Make_mvc.mak +++ b/src/Make_mvc.mak @@ -23,7 +23,7 @@ # # OLE interface: OLE=yes (usually with GUI=yes) # -# Multibyte support: MBYTE=yes +# Multibyte support: MBYTE=yes (default is no) # # IME support: IME=yes (requires GUI=yes) # DYNAMIC_IME=[yes or no] (to load the imm32.dll dynamically, default diff --git a/src/normal.c b/src/normal.c index aae515ca5..3a336d5e1 100644 --- a/src/normal.c +++ b/src/normal.c @@ -7880,9 +7880,13 @@ nv_g_cmd(cap) /* * "g8": Display the bytes used for the UTF-8 character under the * cursor. It is displayed in hex. + * "8g8" finds illegal byte sequence. */ case '8': - show_utf8(); + if (cap->count0 == 8) + utf_find_illegal(); + else + show_utf8(); break; #endif diff --git a/src/os_vms.c b/src/os_vms.c index 28976b131..f87a1cd5d 100644 --- a/src/os_vms.c +++ b/src/os_vms.c @@ -298,35 +298,35 @@ vms_sys_status(int status) int vms_read(char *inbuf, size_t nbytes) { - int status, function, len; - TT_MODE tt_mode; - ITEM itmlst[2]; /* terminates on everything */ + int status, function, len; + TT_MODE tt_mode; + ITEM itmlst[2]; /* terminates on everything */ static long trm_mask[8] = {-1, -1, -1, -1, -1, -1, -1, -1}; /* whatever happened earlier we need an iochan here */ if (!iochan) - tt_mode = get_tty(); + tt_mode = get_tty(); /* important: clean the inbuf */ memset(inbuf, 0, nbytes); /* set up the itemlist for the first read */ vul_item(&itmlst[0], 0, TRM$_MODIFIERS, - (char *)( TRM$M_TM_NOECHO | TRM$M_TM_NOEDIT | - TRM$M_TM_NOFILTR | TRM$M_TM_TRMNOECHO | - TRM$M_TM_NORECALL) , 0); + (char *)( TRM$M_TM_NOECHO | TRM$M_TM_NOEDIT | + TRM$M_TM_NOFILTR | TRM$M_TM_TRMNOECHO | + TRM$M_TM_NORECALL) , 0); vul_item(&itmlst[1], sizeof(trm_mask), TRM$_TERM, (char *)&trm_mask, 0); /* wait forever for a char */ function = (IO$_READLBLK | IO$M_EXTEND); status = sys$qiow(0, iochan, function, &iosb, 0, 0, - inbuf, nbytes-1, 0, 0, &itmlst, sizeof(itmlst)); + inbuf, nbytes-1, 0, 0, &itmlst, sizeof(itmlst)); len = strlen(inbuf); /* how many chars we got? */ /* read immedatelly the rest in the IO queue */ function = (IO$_READLBLK | IO$M_TIMED | IO$M_ESCAPE | IO$M_NOECHO | IO$M_NOFILTR); status = sys$qiow(0, iochan, function, &iosb, 0, 0, - inbuf+len, nbytes-1-len, 0, 0, 0, 0); + inbuf+len, nbytes-1-len, 0, 0, 0, 0); len = strlen(inbuf); /* return the total length */ diff --git a/src/testdir/test61.ok b/src/testdir/test61.ok index 0a22457b6..c23fe2298 100644 --- a/src/testdir/test61.ok +++ b/src/testdir/test61.ok @@ -7,12 +7,12 @@ 123456 1234567 12345678 -123456789 456789 3456789 23456789 123456789 123456789 +123456789 123456 2222 ----- 123456abc |