--- a/mercurial/cmdutil.py	Tue Oct 17 22:46:08 2017 +0200
+++ b/mercurial/cmdutil.py	Wed Oct 18 19:00:33 2017 +0200
@@ -2652,6 +2652,9 @@
                 lineranges = fctxlineranges.get(fctx.path())
                 if lineranges is not None:
                     for hr, lines in hunks:
+                        if hr is None: # binary
+                            yield hr, lines
+                            continue
                         if any(mdiff.hunkinrange(hr[2:], lr)
                                for lr in lineranges):
                             yield hr, lines