Add changelog entries for issue #86 and issue #91.

2 files changed, 8 insertions, 6 deletions

diff --git a/CHANGES.txt b/CHANGES.txt
index eb2cc32..f97f86c 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -7,6 +7,10 @@ Changelog
 
 * Set a sensible default path for config file on Windows. (Issue #95)
 
+* Allow ``verbose`` in the configuration file. (Issue #91)
+
+* Show the enforced ``max-line-length`` in the error message. (Issue #86)
+
 
 1.3.1 (2012-06-18)
 ------------------
diff --git a/pep8.py b/pep8.py
index 223fd87..537a1a7 100755
--- a/pep8.py
+++ b/pep8.py
@@ -271,9 +271,8 @@ def maximum_line_length(physical_line, max_line_length):
             except UnicodeError:
                 pass
         if length > max_line_length:
-            return max_line_length, \
-                "E501 line too long (%d characters > max %d)" % \
-                (length, max_line_length)
+            return (max_line_length, "E501 line too long "
+                    "(%d > %d characters)" % (length, max_line_length))
 
 
 ##############################################################################
@@ -1799,9 +1798,8 @@ def process_options(arglist=None, parse_argv=False, config_file=None):
     parser = OptionParser(version=__version__,
                           usage="%prog [options] input ...")
     parser.config_options = [
-        'exclude', 'filename', 'select', 'ignore', 'max-line-length',
-        'count', 'format', 'quiet', 'show-pep8', 'show-source', 'statistics',
-        'verbose']
+        'exclude', 'filename', 'select', 'ignore', 'max-line-length', 'count',
+        'format', 'quiet', 'verbose', 'show-pep8', 'show-source', 'statistics']
     parser.add_option('-v', '--verbose', default=0, action='count',
                       help="print status messages, or debug with -vv")
     parser.add_option('-q', '--quiet', default=0, action='count',