Merge from emacs-23; up to 2010-06-11T14:39:54Z!cyd@stupidchicken.com.
authorGlenn Morris <rgm@gnu.org>
Tue, 17 May 2011 02:26:56 +0000 (19:26 -0700)
committerGlenn Morris <rgm@gnu.org>
Tue, 17 May 2011 02:26:56 +0000 (19:26 -0700)
commitc71a0d48f3c880248a7f7f25e92ddbcbad5ef0e7
tree95faf008ad25b86853394e20af6a5b129d5b2a97
parente5946384189a9c0cc818687a497978182914f395
parent165fd2df8cc5cfc292d8f2b81c7ff259bf7b9561
Merge from emacs-23; up to 2010-06-11T14:39:54Z!cyd@stupidchicken.com.
24 files changed:
doc/emacs/ChangeLog
doc/emacs/building.texi
doc/emacs/calendar.texi
doc/emacs/cmdargs.texi
doc/emacs/custom.texi
doc/emacs/display.texi
doc/emacs/emacs.texi
doc/emacs/fixit.texi
doc/emacs/frames.texi
doc/emacs/help.texi
doc/emacs/macos.texi
doc/emacs/mini.texi
doc/emacs/misc.texi
doc/emacs/msdog.texi
doc/emacs/mule.texi
doc/emacs/programs.texi
doc/emacs/rmail.texi
doc/emacs/text.texi
doc/emacs/trouble.texi
doc/emacs/windows.texi
doc/emacs/xresources.texi
lisp/ChangeLog
lisp/progmodes/python.el
lisp/vc/diff-mode.el