* lisp/emacs-lisp/eldoc.el (eldoc-highlight-function-argument): Handle the
case where we're currently providing part of the &rest arg after some
&key args, as in define-ibuffer-op.
* lisp/emacs-lisp/eldoc.el (eldoc-function-argstring): Don't strip
terminating paren.
(eldoc-last-data-store): Return cached data.
(eldoc-get-var-docstring): Avoid setq.
(eldoc-get-fnsym-args-string): Clarify data flow.
Remove stray semicolons.
* lisp/vc/vc-git.el (vc-git-conflicted-files): Fix bug when git status
returns nil.
Ignore files and fix indentation of else static if in d-mode
Emacs compiles after porting changes from http://cx4a.org/repo/emacs.bzr/regexp
Add flag compilation-do-echo-command