Merge changes from emacs-23 branch.
commit1099930585662f32278796f9943ac8b50a1179f1
authorChong Yidong <cyd@stupidchicken.com>
Mon, 6 Sep 2010 16:38:03 +0000 (6 12:38 -0400)
committerChong Yidong <cyd@stupidchicken.com>
Mon, 6 Sep 2010 16:38:03 +0000 (6 12:38 -0400)
tree9f448d991fdb0d5a045f4713d59342151695773a
parented96ace9289c2e04db3e8fc63321fde248c3f3f8
parent9c405a86c6d6ee1034252d653c246ef509145000
Merge changes from emacs-23 branch.
doc/emacs/ChangeLog
doc/emacs/dired.texi
doc/lispref/ChangeLog
lisp/ChangeLog
lisp/desktop.el
lisp/files.el
lisp/textmodes/bibtex.el