aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman2006-04-07 18:23:03 +0000
committerRichard M. Stallman2006-04-07 18:23:03 +0000
commit14f4194d139afb9eb9ac8a2d579ebf31eea75c28 (patch)
treefc0bdaa575fa4fd336dd629764a3b69cb6534a48
parent5b31640cadf1f58d59f34ae9763d7ec3921e225a (diff)
downloademacs-14f4194d139afb9eb9ac8a2d579ebf31eea75c28.tar.gz
emacs-14f4194d139afb9eb9ac8a2d579ebf31eea75c28.zip
(Basic Indent): C-j deletes trailing whitespace before the newline.
-rw-r--r--man/ChangeLog1
-rw-r--r--man/programs.texi7
2 files changed, 5 insertions, 3 deletions
diff --git a/man/ChangeLog b/man/ChangeLog
index a7888a682da..f7d5f35b5b0 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -2,6 +2,7 @@
2 2
3 * programs.texi (Comments, Comment Commands, Options for Comments) 3 * programs.texi (Comments, Comment Commands, Options for Comments)
4 (Multi-Line Comments): "Align", not "indent". 4 (Multi-Line Comments): "Align", not "indent".
5 (Basic Indent): C-j deletes trailing whitespace before the newline.
5 6
62006-04-06 Richard Stallman <rms@gnu.org> 72006-04-06 Richard Stallman <rms@gnu.org>
7 8
diff --git a/man/programs.texi b/man/programs.texi
index 5cd769446ae..59ea979399d 100644
--- a/man/programs.texi
+++ b/man/programs.texi
@@ -387,9 +387,10 @@ the characters around it.
387@findex newline-and-indent 387@findex newline-and-indent
388 When entering lines of new code, use @kbd{C-j} 388 When entering lines of new code, use @kbd{C-j}
389(@code{newline-and-indent}), which inserts a newline and then adjusts 389(@code{newline-and-indent}), which inserts a newline and then adjusts
390indentation after it. Thus, @kbd{C-j} at the end of a line creates a 390indentation after it. (It also deletes any trailing whitespace which
391blank line with appropriate indentation. In programming language 391remains before the new newline.) Thus, @kbd{C-j} at the end of a line
392modes, it is equivalent to @key{RET} @key{TAB}. 392creates a blank line with appropriate indentation. In programming
393language modes, it is equivalent to @key{RET} @key{TAB}.
393 394
394 @key{TAB} indents a line that starts within a parenthetical grouping 395 @key{TAB} indents a line that starts within a parenthetical grouping
395under the preceding line within the grouping, or the text after the 396under the preceding line within the grouping, or the text after the