aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorGlenn Morris2014-03-05 20:11:08 -0800
committerGlenn Morris2014-03-05 20:11:08 -0800
commit03bc753ef6410e0203886d48593f6f466873a53e (patch)
tree67db071b817091f3d395e45ebd19375d610d1fd0 /lisp
parent222426f69493fda9bdbcb8884fb0c9b2ff643595 (diff)
downloademacs-03bc753ef6410e0203886d48593f6f466873a53e.tar.gz
emacs-03bc753ef6410e0203886d48593f6f466873a53e.zip
* lisp/simple.el (newline): Doc tweak.
* etc/NEWS: Related edit.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/simple.el5
2 files changed, 5 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 04af3ca01a5..ae71a8f8e65 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
12014-03-06 Glenn Morris <rgm@gnu.org> 12014-03-06 Glenn Morris <rgm@gnu.org>
2 2
3 * simple.el (newline): Doc tweak.
4
3 * emacs-lisp/shadow.el (load-path-shadows-find): 5 * emacs-lisp/shadow.el (load-path-shadows-find):
4 Ignore dir-locals. (Bug#12357) 6 Ignore dir-locals. (Bug#12357)
5 7
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
383text-property `hard'. 383text-property `hard'.
384With ARG, insert that many newlines. 384With ARG, insert that many newlines.
385 385
386To turn off indentation by this command, disable Electric Indent mode 386If `electric-indent-mode' is enabled, this indents the final new line
387\(see \\[electric-indent-mode]). 387that it adds, and reindents the preceding line. To just insert
388a newline, use \\[electric-indent-just-newline].
388 389
389Calls `auto-fill-function' if the current column number is greater 390Calls `auto-fill-function' if the current column number is greater
390than the value of `fill-column' and ARG is nil. 391than the value of `fill-column' and ARG is nil.