From 03bc753ef6410e0203886d48593f6f466873a53e Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Wed, 5 Mar 2014 20:11:08 -0800 Subject: [PATCH] * lisp/simple.el (newline): Doc tweak. * etc/NEWS: Related edit. --- etc/NEWS | 6 ++++-- lisp/ChangeLog | 2 ++ lisp/simple.el | 5 +++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/etc/NEWS b/etc/NEWS index f0d1b95d10f..69e65cc55a1 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -351,6 +351,10 @@ means to always load the .elc file. ** Indentation changes +*** `electric-indent-mode' is now enabled by default. +E.g., typing RET reindents the current line and indents the new line. +`C-j' inserts a newline but does not indent. + +++ *** The behavior of `C-x TAB' (`indent-rigidly') has changed. When invoked without a prefix argument, it now activates a transient @@ -358,8 +362,6 @@ mode in which typing , , , and adjusts the text indentation in the region. Typing any other key resumes normal editing behavior. -*** `electric-indent-mode' is enabled by default. - +++ *** `tab-stop-list' is now implicitly extended to infinity by repeating the last step. Its default value is changed to nil, which means a tab diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 04af3ca01a5..ae71a8f8e65 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,7 @@ 2014-03-06 Glenn Morris + * simple.el (newline): Doc tweak. + * emacs-lisp/shadow.el (load-path-shadows-find): Ignore dir-locals. (Bug#12357) diff --git a/lisp/simple.el b/lisp/simple.el index 200e86596d7..f9447b1fff4 100644 --- a/lisp/simple.el +++ b/lisp/simple.el @@ -383,8 +383,9 @@ If option `use-hard-newlines' is non-nil, the newline is marked with the text-property `hard'. With ARG, insert that many newlines. -To turn off indentation by this command, disable Electric Indent mode -\(see \\[electric-indent-mode]). +If `electric-indent-mode' is enabled, this indents the final new line +that it adds, and reindents the preceding line. To just insert +a newline, use \\[electric-indent-just-newline]. Calls `auto-fill-function' if the current column number is greater than the value of `fill-column' and ARG is nil. -- 2.39.2