merge

2 files changed, 4 insertions, 2 deletions

diff --git a/pygments/lexers/asm.py b/pygments/lexers/asm.py
index 9e59e620..26951f7e 100644
--- a/pygments/lexers/asm.py
+++ b/pygments/lexers/asm.py
@@ -302,7 +302,7 @@ class NasmLexer(RegexLexer):
     binn = r'[01]+b'
     decn = r'[0-9]+'
     floatn = decn + r'\.e?' + decn
-    string = r'"(\\"|[^"])*"|' + r"'(\\'|[^'])*'"
+    string = r'"(\\"|[^"\n])*"|' + r"'(\\'|[^'\n])*'|" + r"`(\\`|[^`\n])*`"
     declkw = r'(?:res|d)[bwdqt]|times'
     register = (r'[a-d][lh]|e?[a-d]x|e?[sb]p|e?[sd]i|[c-gs]s|st[0-7]|'
                 r'mm[0-7]|cr[0-4]|dr[0-367]|tr[3-7]')
diff --git a/pygments/lexers/dotnet.py b/pygments/lexers/dotnet.py
index ae2dbc64..8b7a0b89 100644
--- a/pygments/lexers/dotnet.py
+++ b/pygments/lexers/dotnet.py
@@ -465,6 +465,7 @@ class VbNetLexer(RegexLexer):
         ]
     }
 
+
 class GenericAspxLexer(RegexLexer):
     """
     Lexer for ASP.NET pages.
@@ -487,6 +488,7 @@ class GenericAspxLexer(RegexLexer):
         ],
     }
 
+
 #TODO support multiple languages within the same source file
 class CSharpAspxLexer(DelegatingLexer):
     """
@@ -507,7 +509,7 @@ class CSharpAspxLexer(DelegatingLexer):
             return 0.2
         elif re.search(r'script[^>]+language=["\']C#', text, re.I) is not None:
             return 0.15
-        return 0.001 # TODO really only for when filename matched...
+
 
 class VbNetAspxLexer(DelegatingLexer):
     """