Merge from emacs-24 branch
authorChong Yidong <cyd@gnu.org>
Fri, 20 Apr 2012 08:48:50 +0000 (16:48 +0800)
committerChong Yidong <cyd@gnu.org>
Fri, 20 Apr 2012 08:48:50 +0000 (16:48 +0800)
commitc07a4c0b599e0debfb10acdf02ac6559b998a88a
treef87bca47c21f04b43cca2347a21ed89c57b67958
parent6cf2a23e297b8a57a70c2a1dab5aa28b73461b0b
parent50e5ebca7edcf5299b89ff74499991de01e22046
Merge from emacs-24 branch
22 files changed:
ChangeLog
autogen/configure
configure.in
doc/lispref/ChangeLog
doc/lispref/files.texi
doc/lispref/help.texi
doc/lispref/keymaps.texi
doc/lispref/minibuf.texi
doc/lispref/processes.texi
doc/misc/ChangeLog
etc/ChangeLog
lib-src/ChangeLog
lisp/ChangeLog
lisp/battery.el
lisp/progmodes/gdb-mi.el
lisp/progmodes/grep.el
lisp/server.el
lisp/subr.el
lisp/window.el
src/ChangeLog
src/process.c
src/xdisp.c