Merge changes from emacs-23 branch.
commit4c14013dbec3a2f130a38e61e885f1e8cc6c325b
authorJuanma Barranquero <lekktu@gmail.com>
Mon, 11 Oct 2010 23:57:49 +0000 (12 01:57 +0200)
committerJuanma Barranquero <lekktu@gmail.com>
Mon, 11 Oct 2010 23:57:49 +0000 (12 01:57 +0200)
treeb74121c8de587c217f0d146752e8893d0874aae7
parentf0b7f5a884806112b6a938b9c31607ea005431d3
parenta2e35ef5d52031e0fa184d1863fe7cb7043ef637
Merge changes from emacs-23 branch.
12 files changed:
ChangeLog
doc/man/ChangeLog
doc/man/emacs.1
etc/NEWS.23
lisp/ChangeLog
lisp/cus-start.el
lisp/emacs-lisp/lisp.el
lisp/emacs-lisp/shadow.el
lisp/term/ns-win.el
make-dist
src/ChangeLog
src/nsterm.m