Mercurial > emacs
diff src/textprop.c @ 108399:eb2ca69029d2
Merge from mainline.
author | Katsumi Yamaoka <yamaoka@jpl.org> |
---|---|
date | Sun, 17 Jan 2010 12:46:11 +0000 |
parents | 1d1d5d9bd884 |
children | 51a1add37c3f |
author | Katsumi Yamaoka <yamaoka@jpl.org> |
---|---|
date | Sun, 17 Jan 2010 12:46:11 +0000 |
parents | 1d1d5d9bd884 |
children | 51a1add37c3f |