comparison src/ex_cmds.c @ 963:7644c80ca87b v7.0.089

updated for version 7.0-089
author vimboss
date Tue, 05 Sep 2006 16:30:40 +0000
parents c06c658691e2
children 0b056c1350dd
comparison
equal deleted inserted replaced
962:ca4883686f93 963:7644c80ca87b
93 buf2[0] = NUL; 93 buf2[0] = NUL;
94 vim_snprintf((char *)IObuff, IOSIZE, 94 vim_snprintf((char *)IObuff, IOSIZE,
95 _("<%s>%s%s %d, Hex %02x, Octal %03o"), 95 _("<%s>%s%s %d, Hex %02x, Octal %03o"),
96 transchar(c), buf1, buf2, c, c, c); 96 transchar(c), buf1, buf2, c, c, c);
97 #ifdef FEAT_MBYTE 97 #ifdef FEAT_MBYTE
98 c = cc[ci++]; 98 if (enc_utf8)
99 c = cc[ci++];
100 else
101 c = 0;
99 #endif 102 #endif
100 } 103 }
101 104
102 #ifdef FEAT_MBYTE 105 #ifdef FEAT_MBYTE
103 /* Repeat for combining characters. */ 106 /* Repeat for combining characters. */
106 len = (int)STRLEN(IObuff); 109 len = (int)STRLEN(IObuff);
107 /* This assumes every multi-byte char is printable... */ 110 /* This assumes every multi-byte char is printable... */
108 if (len > 0) 111 if (len > 0)
109 IObuff[len++] = ' '; 112 IObuff[len++] = ' ';
110 IObuff[len++] = '<'; 113 IObuff[len++] = '<';
111 if (utf_iscomposing(c) 114 if (enc_utf8 && utf_iscomposing(c)
112 # ifdef USE_GUI 115 # ifdef USE_GUI
113 && !gui.in_use 116 && !gui.in_use
114 # endif 117 # endif
115 ) 118 )
116 IObuff[len++] = ' '; /* draw composing char on top of a space */ 119 IObuff[len++] = ' '; /* draw composing char on top of a space */
118 vim_snprintf((char *)IObuff + len, IOSIZE - len, 121 vim_snprintf((char *)IObuff + len, IOSIZE - len,
119 c < 0x10000 ? _("> %d, Hex %04x, Octal %o") 122 c < 0x10000 ? _("> %d, Hex %04x, Octal %o")
120 : _("> %d, Hex %08x, Octal %o"), c, c, c); 123 : _("> %d, Hex %08x, Octal %o"), c, c, c);
121 if (ci == MAX_MCO) 124 if (ci == MAX_MCO)
122 break; 125 break;
123 c = cc[ci++]; 126 if (enc_utf8)
127 c = cc[ci++];
128 else
129 c = 0;
124 } 130 }
125 #endif 131 #endif
126 132
127 msg(IObuff); 133 msg(IObuff);
128 } 134 }