=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2012-09-10 19:22:53 +0000
+++ lisp/ChangeLog	2012-09-11 09:25:45 +0000
@@ -1,3 +1,12 @@
+2012-09-11  Dmitry Gutov  <dgutov@yandex.ru>
+
+	* simple.el (default-indent-new-line): Fix the doctring.
+	* bindings.el (esc-map): Rebind M-j and C-M-j to
+	default-indent-new-line.
+	* textmodes/refill.el (refill-post-command-function): Replace
+	indent-new-comment-line with default-indent-new-line in the
+	special cases list.
+
 2012-09-10  Michael R. Mauger  <mmaug@yahoo.com>
 
 	* progmodes/sql.el: Version 3.1

=== modified file 'lisp/bindings.el'
--- lisp/bindings.el	2012-08-15 16:29:11 +0000
+++ lisp/bindings.el	2012-09-11 06:35:54 +0000
@@ -1105,8 +1105,8 @@
 (define-key ctl-x-map "\C-t" 'transpose-lines)
 
 (define-key esc-map ";" 'comment-dwim)
-(define-key esc-map "j" 'indent-new-comment-line)
-(define-key esc-map "\C-j" 'indent-new-comment-line)
+(define-key esc-map "j" 'default-indent-new-line)
+(define-key esc-map "\C-j" 'default-indent-new-line)
 (define-key ctl-x-map ";" 'comment-set-column)
 (define-key ctl-x-map "f" 'set-fill-column)
 (define-key ctl-x-map "$" 'set-selective-display)

=== modified file 'lisp/simple.el'
--- lisp/simple.el	2012-09-07 08:58:31 +0000
+++ lisp/simple.el	2012-09-11 06:34:40 +0000
@@ -5501,7 +5501,7 @@
 
 (defun default-indent-new-line (&optional soft)
   "Break line at point and indent.
-If a comment syntax is defined, call `comment-indent-new-line'.
+If a comment syntax is defined, call `comment-line-break-function'.
 
 The inserted newline is marked hard if variable `use-hard-newlines' is true,
 unless optional argument SOFT is non-nil."

=== modified file 'lisp/textmodes/refill.el'
--- lisp/textmodes/refill.el	2012-07-11 23:13:41 +0000
+++ lisp/textmodes/refill.el	2012-09-11 06:50:28 +0000
@@ -179,7 +179,7 @@
 	 (refill-fill-paragraph-at refill-doit)
 	 (setq refill-doit nil)))
       ((or `quoted-insert `fill-paragraph `fill-region) nil)
-      ((or `newline `newline-and-indent `open-line `indent-new-comment-line
+      ((or `newline `newline-and-indent `open-line `default-indent-new-line
            `reindent-then-newline-and-indent)
        ;; Don't zap what was just inserted.
        (save-excursion