1 files changed, 11 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ca0b3ef37ba..a29ca51033d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,14 @@
+2012-10-04  Fabián Ezequiel Gallina  <fgallina@cuca>
+
+        Allow user to set docstring style for fill-paragraph.
+        * progmodes/python.el
+        (python-fill-comment-function, python-fill-string-function)
+        (python-fill-decorator-function, python-fill-paren-function):
+        Remove :safe for defcustoms.
+        (python-fill-string-style): New defcustom
+        (python-fill-paragraph-function): Enhanced context detection.
+        (python-fill-string): Honor python-fill-string-style settings.
+
 2012-10-04  Martin Rudalics  <rudalics@gmx.at>
 
         * emacs-lisp/edebug.el (edebug-pop-to-buffer): Select window