diff options
| author | Richard M. Stallman | 2006-04-07 02:00:57 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 2006-04-07 02:00:57 +0000 |
| commit | bb63d706891927d6badec815fae773e8b411cf74 (patch) | |
| tree | c3bdc681a2e318a94027c6e0a4bc9da78422c71d | |
| parent | 84471245fca81b226bc4233780d8f49c31a37725 (diff) | |
| download | emacs-bb63d706891927d6badec815fae773e8b411cf74.tar.gz emacs-bb63d706891927d6badec815fae773e8b411cf74.zip | |
(Basic Indent): Clarify relationship of C-j to TAB.
| -rw-r--r-- | man/ChangeLog | 4 | ||||
| -rw-r--r-- | man/programs.texi | 10 |
2 files changed, 10 insertions, 4 deletions
diff --git a/man/ChangeLog b/man/ChangeLog index 4835006dc73..22115bb7e5c 100644 --- a/man/ChangeLog +++ b/man/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2006-04-06 Richard Stallman <rms@gnu.org> | ||
| 2 | |||
| 3 | * programs.texi (Basic Indent): Clarify relationship of C-j to TAB. | ||
| 4 | |||
| 1 | 2006-04-06 Eli Zaretskii <eliz@gnu.org> | 5 | 2006-04-06 Eli Zaretskii <eliz@gnu.org> |
| 2 | 6 | ||
| 3 | * killing.texi (Rectangles): Add index entry for marking a | 7 | * killing.texi (Rectangles): Add index entry for marking a |
diff --git a/man/programs.texi b/man/programs.texi index 9ec4f7ff2d3..12e594c1868 100644 --- a/man/programs.texi +++ b/man/programs.texi | |||
| @@ -360,7 +360,8 @@ usual conventions of the language you are editing. | |||
| 360 | @item @key{TAB} | 360 | @item @key{TAB} |
| 361 | Adjust indentation of current line. | 361 | Adjust indentation of current line. |
| 362 | @item C-j | 362 | @item C-j |
| 363 | Equivalent to @key{RET} followed by @key{TAB} (@code{newline-and-indent}). | 363 | Insert a newline, then adjust indentation of following line |
| 364 | (@code{newline-and-indent}). | ||
| 364 | @end table | 365 | @end table |
| 365 | 366 | ||
| 366 | @kindex TAB @r{(programming modes)} | 367 | @kindex TAB @r{(programming modes)} |
| @@ -385,9 +386,10 @@ the characters around it. | |||
| 385 | @kindex C-j | 386 | @kindex C-j |
| 386 | @findex newline-and-indent | 387 | @findex newline-and-indent |
| 387 | When entering lines of new code, use @kbd{C-j} | 388 | When entering lines of new code, use @kbd{C-j} |
| 388 | (@code{newline-and-indent}), which is equivalent to @key{RET} | 389 | (@code{newline-and-indent}), which inserts a newline and then adjusts |
| 389 | followed by @key{TAB}. @kbd{C-j} at the end of a line creates a | 390 | indentation after it. Thus, @kbd{C-j} at the end of a line creates a |
| 390 | blank line and then gives it the appropriate indentation. | 391 | blank line with appropriate indentation. In programming language |
| 392 | modes, it is equivalent to @key{RET} @key{TAB}. | ||
| 391 | 393 | ||
| 392 | @key{TAB} indents a line that starts within a parenthetical grouping | 394 | @key{TAB} indents a line that starts within a parenthetical grouping |
| 393 | under the preceding line within the grouping, or the text after the | 395 | under the preceding line within the grouping, or the text after the |