[PATCH v2 33/38] doc/sphinx: Pass right filename as source

From: Jani Nikula
Date: Sat Jun 04 2016 - 07:41:14 EST


From: Daniel Vetter <daniel.vetter@xxxxxxxx>

With this error output becomes almost readable. The line numbers are
still totally bonghits, but that's a lot harder to pull out of
kerneldoc. We'd essentially have to insert some special markers in the
kernel-doc output, split the output along these markers and then
insert each block separately using

state_machine.insert_input(block, source, first_line)

Cc: Jani Nikula <jani.nikula@xxxxxxxxx>
Cc: linux-doc@xxxxxxxxxxxxxxx
Cc: Jonathan Corbet <corbet@xxxxxxx>
Signed-off-by: Daniel Vetter <daniel.vetter@xxxxxxxxx>
Signed-off-by: Jani Nikula <jani.nikula@xxxxxxxxx>
---
Documentation/sphinx/kernel-doc.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/sphinx/kernel-doc.py b/Documentation/sphinx/kernel-doc.py
index a6e170872c8a..9fc2c27916a9 100644
--- a/Documentation/sphinx/kernel-doc.py
+++ b/Documentation/sphinx/kernel-doc.py
@@ -57,7 +57,7 @@ class KernelDocDirective(Directive):
env.note_dependency(os.path.abspath(filename))

tab_width = self.options.get('tab-width', self.state.document.settings.tab_width)
- source = self.state_machine.input_lines.source(self.lineno - self.state_machine.input_offset - 1)
+ source = filename

# FIXME: make this nicer and more robust against errors
if 'export' in self.options:
--
2.1.4