Merge branch 'master' into 671/upsuper/webidl

This allows us to resolve the merge conflict properly.

1 files changed, 5 insertions, 4 deletions

diff --git a/pygments/lexers/matlab.py b/pygments/lexers/matlab.py
index 64dd3a3c..16df0398 100644
--- a/pygments/lexers/matlab.py
+++ b/pygments/lexers/matlab.py
@@ -104,8 +104,8 @@ class MatlabLexer(RegexLexer):
             # is recognized if it is either surrounded by spaces or by no
             # spaces on both sides; only the former case matters for us.  (This
             # allows distinguishing `cd ./foo` from `cd ./ foo`.)
-            (r'(?:^|(?<=;))\s*\w+\s+(?!=|\(|(%s)\s+)' % _operators, Name,
-             'commandargs'),
+            (r'(?:^|(?<=;))(\s*)(\w+)(\s+)(?!=|\(|(%s)\s+)' % _operators,
+             bygroups(Text, Name, Text), 'commandargs'),
 
             # operators:
             (_operators, Operator),
@@ -147,9 +147,10 @@ class MatlabLexer(RegexLexer):
             (r"[^']*'", String, '#pop'),
         ],
         'commandargs': [
+            (r"[ \t]+", Text),
             ("'[^']*'", String),
-            ("[^';\n]+", String),
-            (";?\n?", Punctuation, '#pop'),
+            (r"[^';\s]+", String),
+            (";?", Punctuation, '#pop'),
         ]
     }