Add changelog entry for emphasize-lines and some coding style fixes.

1 files changed, 4 insertions, 5 deletions

diff --git a/sphinx/highlighting.py b/sphinx/highlighting.py
index 65fe9f7d3..0912ee053 100644
--- a/sphinx/highlighting.py
+++ b/sphinx/highlighting.py
@@ -101,6 +101,10 @@ class PygmentsBridge(object):
             self.formatter = self.latex_formatter
             self.formatter_args['commandprefix'] = 'PYG'
 
+    def get_formatter(self, **kwargs):
+        kwargs.update(self.formatter_args)
+        return self.formatter(**kwargs)
+
     def unhighlighted(self, source):
         if self.dest == 'html':
             return '<pre>' + cgi.escape(source) + '</pre>\n'
@@ -212,11 +216,6 @@ class PygmentsBridge(object):
             # so let it pass unhighlighted
             return self.unhighlighted(source)
 
-    def get_formatter(self, **kwargs_orig):
-        kwargs = self.formatter_args.copy()
-        kwargs.update(kwargs_orig)
-        return self.formatter(**kwargs)
-
     def get_stylesheet(self):
         if not pygments:
             if self.dest == 'latex':