Merge from emacs-23; up to 2010-06-10T12:56:11Z!michael.albinus@gmx.de.
commitd2fc7e3d0f6f57f962cbd94df3bf4fd15a37bb68
authorGlenn Morris <rgm@gnu.org>
Thu, 12 May 2011 07:07:06 +0000 (12 00:07 -0700)
committerGlenn Morris <rgm@gnu.org>
Thu, 12 May 2011 07:07:06 +0000 (12 00:07 -0700)
treee6d877c35b4396bd5092a7be244b1527374d4a0e
parentd45885f7e0025fb5bd0756ba78c511a981d64533
parente531bdfff1ee57a0ba4af6c8575ed7856e4c86d2
Merge from emacs-23; up to 2010-06-10T12:56:11Z!michael.albinus@gmx.de.
14 files changed:
doc/lispref/ChangeLog
doc/lispref/elisp.texi
doc/lispref/files.texi
doc/lispref/modes.texi
doc/lispref/vol1.texi
doc/lispref/vol2.texi
lisp/ChangeLog
lisp/emacs-lisp/lisp.el
lisp/progmodes/which-func.el
lisp/vc/smerge-mode.el
src/ChangeLog
src/textprop.c
src/w32term.c
src/xterm.c