master updated (c97716e -> b0d0198)

[Lars Ingebrigtsen]

larsi pushed a change to branch master.

      from  c97716e   * lisp/mpc.el (mpc-format): Fix inf-loop in constructed 
predicate
       new  a4c922d   Clarify indent-line-function doc string
       new  b0d0198   Tweak octave continuation indentation


Summary of changes:
 lisp/indent.el                                     |  4 +--
 lisp/progmodes/octave.el                           |  2 +-
 .../progmodes/octave-tests.el}                     | 42 +++++++++++++---------
 3 files changed, 29 insertions(+), 19 deletions(-)
 copy test/{misc/test-custom-opts.el => lisp/progmodes/octave-tests.el} (59%)