Merge from trunk
commit91184af015b4eb0ced1227176291ff051f690e7d
authorMartin Rudalics <rudalics@gmx.at>
Tue, 31 May 2011 12:25:16 +0000 (31 14:25 +0200)
committerMartin Rudalics <rudalics@gmx.at>
Tue, 31 May 2011 12:25:16 +0000 (31 14:25 +0200)
treed13fbe403bcbcac4874bd163eae4f31e854d0942
parentfb04f483a6b996215c73479600bdaa08f57137a8
parentb9627cfb1d5b5b0914525a19cd9edb06f91a1665
Merge from trunk
37 files changed:
doc/lispref/ChangeLog
doc/lispref/display.texi
doc/lispref/elisp.texi
doc/lispref/windows.texi
etc/NEWS
lib/getopt_.h
lisp/ChangeLog
lisp/bindings.el
lisp/buff-menu.el
lisp/erc/ChangeLog
lisp/files.el
lisp/gnus/ChangeLog
lisp/gnus/message.el
lisp/ielm.el
lisp/isearch.el
lisp/loadup.el
lisp/mail/sendmail.el
lisp/menu-bar.el
lisp/minibuffer.el
lisp/net/ange-ftp.el
lisp/pcomplete.el
lisp/progmodes/etags.el
lisp/progmodes/python.el
lisp/ps-print.el
lisp/replace.el
lisp/shell.el
lisp/simple.el
lisp/term.el
lisp/textmodes/bibtex.el
lisp/vc/ediff-util.el
lisp/vc/vc-dir.el
src/ChangeLog
src/dispnew.c
src/frame.c
src/lisp.h
src/minibuf.c
src/xdisp.c