* lisp/simple.el (newline): Mention `electric-indent-mode'.

Fixes: debbugs:16015

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9bdea147f437908e2a9d495c1b6400cb55e4823a..41a507f519fed6ac090328dbe7af0e35fc4ca3c1 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,22 +1,20 @@
+2013-12-01  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * simple.el (newline): Mention `electric-indent-mode' (bug#16015).
+
 2013-12-01  Rüdiger Sonderfeld  <ruediger@c-plusplus.de>
 
-       * net/eww.el (eww-form-checkbox-selected-symbol): New
-       customizable variable.
+       * net/eww.el (eww-form-checkbox-selected-symbol)
        (eww-form-checkbox-symbol): New customizable variable.
-       (eww-form-checkbox): Use `eww-form-checkbox-selected-symbol' and
-       `eww-form-checkbox-symbol'.
-       (eww-toggle-checkbox): Use `eww-form-checkbox-selected-symbol' and
-       `eww-form-checkbox-symbol'.
+       (eww-form-checkbox, eww-toggle-checkbox):
+       Use `eww-form-checkbox-selected-symbol' and `eww-form-checkbox-symbol'.
 
-       * net/shr.el (shr-prefer-media-type-alist): : New customizable
-       variable.
-       (shr--get-media-pref): New function.
-       (shr--extract-best-source): New function.
+       * net/shr.el (shr-prefer-media-type-alist): : New customizable variable.
+       (shr--get-media-pref, shr--extract-best-source): New function.
        (shr-tag-video, shr-tag-audio):  Use `shr--extract-best-source' when
        no :src tag was specified.
 
-       * net/eww.el (eww-use-external-browser-for-content-type): New
-       variable.
+       * net/eww.el (eww-use-external-browser-for-content-type): New variable.
        (eww-render): Handle `eww-use-external-browser-for-content-type'.
        Use \\` to match beginning of string instead of ^.
        (eww-browse-with-external-browser): Provide optional URL parameter.
@@ -112,11 +110,11 @@
        (balance-windows-area-adjust, balance-windows-area)
        (window--state-get-1, window-state-get, window--state-put-1)
        (window--state-put-2, window-state-put)
-       (display-buffer-record-window, window--display-buffer): Make
-       functions handle pixelwise sizing of windows.
+       (display-buffer-record-window, window--display-buffer):
+       Make functions handle pixelwise sizing of windows.
        (display-buffer--action-function-custom-type)
-       (display-buffer-fallback-action): Add
-       display-buffer-in-previous-window.
+       (display-buffer-fallback-action):
+       Add display-buffer-in-previous-window.
        (display-buffer-use-some-window): Resize window to height it had
        before.
        (fit-window-to-buffer-horizontally): New option.

diff --git a/lisp/simple.el b/lisp/simple.el
index 16f03d2e5f947bdb5718e6d8badc4ce432deaa24..bdf1455f4e22a16f97cea60eb3db5df7adbdee48 100644 (file)
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -384,7 +384,8 @@ text-property `hard'.
 With ARG, insert that many newlines.
 Call `auto-fill-function' if the current column number is greater
 than the value of `fill-column' and ARG is nil.
-A non-nil INTERACTIVE argument means to run the `post-self-insert-hook'."
+A non-nil INTERACTIVE argument means to run the `post-self-insert-hook',
+which by default will also indent the line (see `electric-indent-mode')."
   (interactive "*P\np")
   (barf-if-buffer-read-only)
   ;; Call self-insert so that auto-fill, abbrev expansion etc. happens.