Merge changes from emacs-23 branch.
authorChong Yidong <cyd@stupidchicken.com>
Sat, 10 Jul 2010 18:52:53 +0000 (14:52 -0400)
committerChong Yidong <cyd@stupidchicken.com>
Sat, 10 Jul 2010 18:52:53 +0000 (14:52 -0400)
commit2ec1b5ee3464999a18b8197101e8bf08a3c564a8
tree4837c369ac576fbfd063b1ff046a3daca372f082
parentc971758df75640c55e6f9d7ac7d9c6909519d0b4
parent7c33a0572280bdcf0583c5625cfda32f63fad56d
Merge changes from emacs-23 branch.
68 files changed:
ChangeLog
doc/emacs/ChangeLog
doc/emacs/basic.texi
doc/emacs/building.texi
doc/emacs/dired.texi
doc/emacs/display.texi
doc/emacs/emacs.texi
doc/emacs/frames.texi
doc/emacs/mule.texi
doc/emacs/search.texi
doc/emacs/xresources.texi
doc/lispintro/ChangeLog
doc/lispref/ChangeLog
doc/lispref/display.texi
doc/lispref/elisp.texi
doc/lispref/internals.texi
doc/lispref/os.texi
doc/lispref/vol1.texi
doc/lispref/vol2.texi
doc/misc/ChangeLog
doc/misc/auth.texi
doc/misc/calc.texi
doc/misc/eshell.texi
doc/misc/faq.texi
doc/misc/gnus.texi
doc/misc/org.texi
doc/misc/tramp.texi
etc/ChangeLog
etc/PROBLEMS
lisp/ChangeLog
lisp/arc-mode.el
lisp/bs.el
lisp/comint.el
lisp/descr-text.el
lisp/emacs-lisp/cl-loaddefs.el
lisp/emulation/cua-base.el
lisp/emulation/pc-select.el
lisp/help.el
lisp/hl-line.el
lisp/htmlfontify.el
lisp/mouse.el
lisp/play/zone.el
lisp/progmodes/cc-mode.el
lisp/progmodes/idlwave.el
lisp/subr.el
lisp/url/ChangeLog
lisp/vc/vc-annotate.el
lisp/vc/vc-dir.el
lisp/vc/vc-git.el
lisp/vc/vc.el
lisp/wid-edit.el
src/ChangeLog
src/alloc.c
src/dispextern.h
src/frame.c
src/fringe.c
src/image.c
src/keyboard.c
src/keymap.c
src/lread.c
src/nsterm.m
src/w32fns.c
src/w32term.c
src/xdisp.c
src/xfaces.c
src/xfns.c
src/xmenu.c
src/xterm.c