Merge from emacs-23 branch
authorChong Yidong <cyd@stupidchicken.com>
Tue, 9 Aug 2011 22:13:11 +0000 (18:13 -0400)
committerChong Yidong <cyd@stupidchicken.com>
Tue, 9 Aug 2011 22:13:11 +0000 (18:13 -0400)
commit7be1c708c5abc7dea388d45454bd19bff07b7943
tree4d86b007b24388f25e83515bd86c42d14de9b77a
parentebb552ed380b9f04e0c6b29374b3d32435837951
parent8d96c9a4e700ad17921f8d2c90f4244bfa4b98b1
Merge from emacs-23 branch
lisp/ChangeLog
lisp/hi-lock.el
lisp/xt-mouse.el
src/ChangeLog
src/fontset.c
src/unexmacosx.c