summaryrefslogtreecommitdiff
path: root/src/buffer.c
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2010-01-16 06:59:23 -0500
committerEli Zaretskii <eliz@gnu.org>2010-01-16 06:59:23 -0500
commit2db38a6f98c2abb42b746064ce97417cccc27e68 (patch)
tree73303f99dc5f8f5eb35dd862a35e6a6609f085fa /src/buffer.c
parent1db6ebe40405dec23b51eb8015c58be0bc46fe13 (diff)
parente118d2be3b70097e71c0be4d0fc1f88b0fb39e88 (diff)
parentf5700c5e7e4f0b5b4d3a1d187328e9e8078ef22d (diff)
downloademacs-2db38a6f98c2abb42b746064ce97417cccc27e68.tar.gz
Merge from mainline.