Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 3 Aug 2011 05:05:38 +0000 (22:05 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 3 Aug 2011 05:05:38 +0000 (22:05 -0700)
commit9a70f03d70e44db2ec9c6d2952cb8a1deae15000
treec0efd5c0a208640c0a883f4566df1b40caa3aaad
parent29c8a348c5c9f326af54a3d30f69cde98fe300bb
Merge from trunk.
60 files changed:
autogen/configure
doc/emacs/ChangeLog
doc/emacs/mini.texi
doc/misc/ChangeLog
doc/misc/trampver.texi
etc/ChangeLog
etc/grammars/README [new file with mode: 0644]
etc/grammars/bovine-grammar.el [new file with mode: 0644]
etc/grammars/c.by [new file with mode: 0644]
etc/grammars/java-tags.wy [new file with mode: 0644]
etc/grammars/js.wy [new file with mode: 0644]
etc/grammars/make.by [new file with mode: 0644]
etc/grammars/python.wy [new file with mode: 0644]
etc/grammars/scheme.by [new file with mode: 0644]
etc/grammars/wisent-grammar.el [new file with mode: 0644]
lisp/ChangeLog
lisp/cedet/ChangeLog
lisp/cedet/semantic/bovine/c-by.el
lisp/cedet/semantic/bovine/make-by.el
lisp/cedet/semantic/bovine/scm-by.el
lisp/cedet/semantic/grammar.el
lisp/cedet/semantic/wisent/javat-wy.el
lisp/cedet/semantic/wisent/js-wy.el
lisp/cedet/semantic/wisent/python-wy.el
lisp/cus-edit.el
lisp/dired-aux.el
lisp/dired.el
lisp/emacs-lisp/cl-macs.el
lisp/emacs-lisp/package.el
lisp/gnus/ChangeLog
lisp/gnus/gnus-art.el
lisp/gnus/gnus-sum.el
lisp/gnus/mm-decode.el
lisp/gnus/nnimap.el
lisp/gnus/nnir.el
lisp/gnus/nnmaildir.el
lisp/gnus/spam.el
lisp/gnus/starttls.el
lisp/ido.el
lisp/info.el
lisp/ldefs-boot.el
lisp/mail/sendmail.el
lisp/mail/smtpmail.el
lisp/net/network-stream.el
lisp/net/rcirc.el
lisp/net/trampver.el
lisp/org/ChangeLog
lisp/org/ob.el
lisp/progmodes/sh-script.el
lisp/window.el
src/ChangeLog
src/bidi.c
src/chartab.c
src/dispextern.h
src/image.c
src/keymap.c
src/lisp.h
src/regex.c
src/w32term.c
src/xdisp.c