Merge changes from emacs-24 branch
authorChong Yidong <cyd@gnu.org>
Fri, 27 Apr 2012 03:10:38 +0000 (11:10 +0800)
committerChong Yidong <cyd@gnu.org>
Fri, 27 Apr 2012 03:10:38 +0000 (11:10 +0800)
commita8e7d6d783219972c08fd49a3a2afaf26eb139c2
tree5e86d23d9285389791dc8321d8a8a2ece2247bea
parentb360839071ef6c7a9e917fe57a4aaeb39138e8c0
parentc5bb756916baa63cc663d68d4c24e5ad33a764e8
Merge changes from emacs-24 branch
48 files changed:
doc/emacs/ChangeLog
doc/emacs/ack.texi
doc/lispref/ChangeLog
doc/lispref/buffers.texi
doc/lispref/commands.texi
doc/lispref/compile.texi
doc/lispref/control.texi
doc/lispref/customize.texi
doc/lispref/display.texi
doc/lispref/eval.texi
doc/lispref/files.texi
doc/lispref/frames.texi
doc/lispref/functions.texi
doc/lispref/hash.texi
doc/lispref/help.texi
doc/lispref/intro.texi
doc/lispref/keymaps.texi
doc/lispref/lists.texi
doc/lispref/macros.texi
doc/lispref/minibuf.texi
doc/lispref/modes.texi
doc/lispref/numbers.texi
doc/lispref/objects.texi
doc/lispref/streams.texi
doc/lispref/symbols.texi
doc/lispref/syntax.texi
doc/lispref/text.texi
doc/lispref/tips.texi
doc/lispref/variables.texi
doc/lispref/windows.texi
doc/misc/ChangeLog
etc/ChangeLog
etc/NEWS
lisp/ChangeLog
lisp/gnus/ChangeLog
lisp/mouse.el
lisp/org/ChangeLog
lisp/progmodes/gdb-mi.el
lisp/progmodes/which-func.el
lisp/simple.el
lisp/startup.el
lisp/subr.el
lisp/vc/vc-git.el
lisp/window.el
src/ChangeLog
src/fileio.c
src/window.c
src/xdisp.c