master updated (130bf51 -> dd910dd)

[João Távora]

capitaomorte pushed a change to branch master.

      from  130bf51   Make format-prompt interpret a nil default value as "no 
default"
       new  bf018ee   ; tiny indentation fix to lisp/progmodes/elisp-mode.el
       new  dd910dd   Place flymake-eldoc-function at the end of 
eldoc-documentation-functions


Summary of changes:
 lisp/progmodes/elisp-mode.el | 2 +-
 lisp/progmodes/flymake.el    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)