summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChong Yidong <cyd@stupidchicken.com>2011-09-18 11:21:57 -0400
committerChong Yidong <cyd@stupidchicken.com>2011-09-18 11:21:57 -0400
commit5ed99d3685cc8d13f8e4c63ad449a6e4d63c8eb0 (patch)
treead9954b4b3c90b7b107406f394f9abf7d7e60693
parent9bade7b2d8122cf9cd0baa62ddc83bb3c4377cd5 (diff)
parent710dec6300f2fedb5df3b8ec0ee2ac9acd812eaf (diff)
parent3390454c621048dcd996f497aba5e807c49dcfaf (diff)
downloademacs-5ed99d3685cc8d13f8e4c63ad449a6e4d63c8eb0.tar.gz
Merge changes from emacs-23 branch