Mercurial > vim

comparison src/screen.c @ 2055:4aa4510d548c v7.2.341

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated for version 7.2.341 Problem: Popup menu wraps to next line when double-wide character doesn't fit. (Jiang Ma) Solution: Display a ">" instead. (Dominique Pelle)
author Bram Moolenaar <bram@zimbu.org>
date Tue, 19 Jan 2010 17:40:46 +0100
parents f13a0227fb88
children 63613d8d7e4d
comparison
equal deleted inserted replaced
2054:79b8d69a4588 2055:4aa4510d548c
6432 u8c = arabic_shape(u8c, &c, &u8cc[0], nc, nc1, pc); 6432 u8c = arabic_shape(u8c, &c, &u8cc[0], nc, nc1, pc);
6433 } 6433 }
6434 else 6434 else
6435 prev_c = u8c; 6435 prev_c = u8c;
6436 # endif 6436 # endif
6437 if (col + mbyte_cells > screen_Columns)
6438 {
6439 /* Only 1 cell left, but character requires 2 cells:
6440 * display a '>' in the last column to avoid wrapping. */
6441 c = '>';
6442 mbyte_cells = 1;
6443 }
6437 } 6444 }
6438 } 6445 }
6439 #endif 6446 #endif
6440 6447
6441 #if defined(FEAT_MBYTE) || defined(FEAT_GUI) || defined(UNIX) 6448 #if defined(FEAT_MBYTE) || defined(FEAT_GUI) || defined(UNIX)
9208 void 9215 void
9209 unshowmode(force) 9216 unshowmode(force)
9210 int force; 9217 int force;
9211 { 9218 {
9212 /* 9219 /*
9213 * Don't delete it right now, when not redrawing or insided a mapping. 9220 * Don't delete it right now, when not redrawing or inside a mapping.
9214 */ 9221 */
9215 if (!redrawing() || (!force && char_avail() && !KeyTyped)) 9222 if (!redrawing() || (!force && char_avail() && !KeyTyped))
9216 redraw_cmdline = TRUE; /* delete mode later */ 9223 redraw_cmdline = TRUE; /* delete mode later */
9217 else 9224 else
9218 { 9225 {