code.delx.au - gnu-emacs/commit

]> code.delx.au - gnu-emacs/commit

delx.au / code / gnu-emacs / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 0a46a12 d419e1d)

author	Kenichi Handa <handa@m17n.org>
	Wed, 1 Sep 2010 07:13:21 +0000 (16:13 +0900)
committer	Kenichi Handa <handa@m17n.org>
	Wed, 1 Sep 2010 07:13:21 +0000 (16:13 +0900)
commit	9e69cb054d5c124bdf913c82453518ac4d9d6d53
tree	95537c8c17759cef4da7241d914059d15d7dc0c4	tree
parent	0a46a12f7a484e3fab96ea2f46fa738e90dabf1c	commit \| diff
parent	d419e1d94e885388b86f8753d741befa1855d333	commit \| diff

merge changes in emacs-23 branch

15 files changed:

doc/man/ChangeLog	diff1 \|	diff2 \|	blob \| history
doc/man/emacs.1	diff1 \|	diff2 \|	blob \| history
doc/misc/ChangeLog	diff1 \|	diff2 \|	blob \| history
etc/ChangeLog	diff1 \|	diff2 \|	blob \| history
leim/ChangeLog	diff1 \|	diff2 \|	blob \| history
lisp/ChangeLog	diff1 \|	diff2 \|	blob \| history
lisp/disp-table.el	diff1 \|	diff2 \|	blob \| history
lisp/international/mule-cmds.el	diff1 \|	diff2 \|	blob \| history
lisp/net/rcirc.el	diff1 \|	diff2 \|	blob \| history
lisp/progmodes/python.el	diff1 \|	diff2 \|	blob \| history
lisp/simple.el	diff1 \|	diff2 \|	blob \| history
src/ChangeLog	diff1 \|	diff2 \|	blob \| history
src/dispextern.h	diff1 \|	diff2 \|	blob \| history
src/term.c	diff1 \|	diff2 \|	blob \| history
src/xdisp.c	diff1 \|	diff2 \|	blob \| history