master updated (41723a3 -> 2075411)

[Mattias Engdegård]

mattiase pushed a change to branch master.

      from  41723a3   Revert "Indent bodies of local function definitions 
properly in elisp-mode"
       new  6374943   ; * test/lisp/emacs-lisp/bytecomp-tests.el: remove 
ineffective \
       new  5810246   org-element: use correct function
       new  2075411   Fix regexp snags in org


Summary of changes:
 lisp/org/ob-java.el                    | 44 ++++++++++++++++++----------------
 lisp/org/org-element.el                |  4 ++--
 lisp/org/ox-org.el                     |  2 +-
 test/lisp/emacs-lisp/bytecomp-tests.el |  2 +-
 4 files changed, 27 insertions(+), 25 deletions(-)