* src/xdisp.c (compute_display_string_pos): Fix bzr merge glitch.
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 14 Aug 2011 06:04:44 +0000 (23:04 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 14 Aug 2011 06:04:44 +0000 (23:04 -0700)
commita29eb766a697b646103c4cc8ab56795acce7beab
tree20e8c6bbe9d544c223d33b9dfceddfdca3628d83
parent19d5c50cbb7d65bfed9e76ccf1c22bada0662f38
* src/xdisp.c (compute_display_string_pos): Fix bzr merge glitch.
src/xdisp.c