master updated (c7b35ea -> 733dfe2)

[Stefan Kangas]

skangas pushed a change to branch master.

      from  c7b35ea   * lisp/emacs-lisp/edebug.el (edebug--handle-&-spec-op) 
<&lookup>: New method
       new  506b8d7   Add font locking for many missing macros in m4-mode
       new  a799f6d   Minor cleanups in scheme.el
       new  fffe88b   Use regexp-opt for font lock defaults in meta-mode.el
       new  733dfe2   ; Fix recent regexp-opt conversion in cperl-mode


Summary of changes:
 lisp/progmodes/cperl-mode.el |  4 +-
 lisp/progmodes/m4-mode.el    | 50 ++++++++++++-----------
 lisp/progmodes/meta-mode.el  | 97 ++++++++++++++++----------------------------
 lisp/progmodes/scheme.el     | 25 ++++--------
 4 files changed, 74 insertions(+), 102 deletions(-)