Merge from emacs-24; up to 2012-12-05T00:13:56Z!yamaoka@jpl.org
commitd5e5e7b41166815a843148f2081d19bc14b628b2
authorGlenn Morris <rgm@gnu.org>
Sun, 30 Dec 2012 18:09:01 +0000 (30 10:09 -0800)
committerGlenn Morris <rgm@gnu.org>
Sun, 30 Dec 2012 18:09:01 +0000 (30 10:09 -0800)
tree6afd575b3a741ce26e5ec1e2665d45dfab8cbb52
parent4f752957f174b5ab95ef6b9428669b1b1ecf0bab
parent5c560880659048888420389c02e20d6867ec81df
Merge from emacs-24; up to 2012-12-05T00:13:56Z!yamaoka@jpl.org
12 files changed:
ChangeLog
configure.ac
doc/lispref/ChangeLog
etc/NEWS
lisp/ChangeLog
lisp/net/tramp-sh.el
lisp/org/ChangeLog
msdos/ChangeLog
src/ChangeLog
src/Makefile.in
src/dispextern.h
src/xdisp.c