Merge from emacs-23 branch.
commit362b9d483c714a8fd87966ddbd8686850f870e34
authorGlenn Morris <rgm@gnu.org>
Sat, 15 Jan 2011 20:03:38 +0000 (15 12:03 -0800)
committerGlenn Morris <rgm@gnu.org>
Sat, 15 Jan 2011 20:03:38 +0000 (15 12:03 -0800)
treee37a94fe030c9361fa28b4f3f5c8910cc7ab8448
parentdab7376027ea499962b2916652c6f30b40eac6d9
parent0ad254447b7542284a2eb3c63b0732edb9409af7
Merge from emacs-23 branch.
17 files changed:
doc/emacs/ChangeLog
doc/emacs/files.texi
doc/emacs/msdog.texi
doc/lispref/ChangeLog
doc/lispref/files.texi
lisp/ChangeLog
lisp/buff-menu.el
lisp/files.el
lisp/jka-compr.el
lisp/mail/rmailmm.el
lisp/net/ldap.el
lisp/net/tramp-sh.el
lisp/net/tramp.el
lisp/progmodes/grep.el
lisp/tmm.el
lisp/vc/vc-bzr.el
lisp/whitespace.el