Merge from emacs-23
authorStefan Monnier <monnier@iro.umontreal.ca>
Tue, 9 Nov 2010 20:07:10 +0000 (15:07 -0500)
committerStefan Monnier <monnier@iro.umontreal.ca>
Tue, 9 Nov 2010 20:07:10 +0000 (15:07 -0500)
commitd607b96bc2824116a8fe0e5840ce49da7ce4514f
tree229a11bba88b67e8961db4d10aa8b3725f3a4873
parent27410d0ac3406a341cc90ada064047a7f1ea5209
parentc00980655bc15ca019fd6c559c69601be18f2407
Merge from emacs-23
31 files changed:
.dir-locals.el
ChangeLog
configure
configure.in
doc/emacs/ChangeLog
doc/misc/ChangeLog
etc/NEWS.23
lisp/ChangeLog
lisp/Makefile.in
lisp/dired.el
lisp/emacs-lisp/cl-loaddefs.el
lisp/files.el
lisp/international/mule-cmds.el
lisp/locate.el
lisp/ls-lisp.el
lisp/minibuffer.el
lisp/net/tramp.el
lisp/progmodes/python.el
lisp/progmodes/tcl.el
lisp/progmodes/verilog-mode.el
lisp/server.el
lisp/vc/vc-mtn.el
oldXMenu/ChangeLog
oldXMenu/XDelAssoc.c
oldXMenu/XMakeAssoc.c
src/ChangeLog
src/config.in
src/image.c
src/xfns.c
src/xterm.c
src/xterm.h