* src/xdisp.c (compute_display_string_pos): Fix bzr merge glitch.