diff options
| author | Richard M. Stallman | 2001-06-01 18:01:37 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 2001-06-01 18:01:37 +0000 |
| commit | 4f7666dc663f1a6db0913fd328d1c3f598ff57c0 (patch) | |
| tree | 5a9427c8c8e3b57ef0772da99469cef5cb070b6d | |
| parent | 6b46232e9baaf3e4ea32b8ce0e9a643ea552ba16 (diff) | |
| download | emacs-4f7666dc663f1a6db0913fd328d1c3f598ff57c0.tar.gz emacs-4f7666dc663f1a6db0913fd328d1c3f598ff57c0.zip | |
Correct names of some C mode indentation commands.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | man/programs.texi | 26 |
2 files changed, 18 insertions, 13 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e91948c1e1d..a14700d250a 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2001-06-01 Richard M. Stallman <rms@gnu.org> | ||
| 2 | |||
| 3 | * help.el (describe-variable): Put value on same line | ||
| 4 | with preceding text, if it is short enough to look good that way. | ||
| 5 | |||
| 1 | 2001-06-01 Eli Zaretskii <eliz@is.elta.co.il> | 6 | 2001-06-01 Eli Zaretskii <eliz@is.elta.co.il> |
| 2 | 7 | ||
| 3 | * term/internal.el (IT-unicode-translations): New variable. | 8 | * term/internal.el (IT-unicode-translations): New variable. |
diff --git a/man/programs.texi b/man/programs.texi index 459f5f88a8e..05b9765f7d0 100644 --- a/man/programs.texi +++ b/man/programs.texi | |||
| @@ -125,19 +125,19 @@ interface to Lisp execution. @xref{Executing Lisp}. | |||
| 125 | Each of the programming language major modes defines the @key{TAB} key | 125 | Each of the programming language major modes defines the @key{TAB} key |
| 126 | to run an indentation function that knows the indentation conventions of | 126 | to run an indentation function that knows the indentation conventions of |
| 127 | that language and updates the current line's indentation accordingly. | 127 | that language and updates the current line's indentation accordingly. |
| 128 | For example, in C mode @key{TAB} is bound to @code{c-indent-line}. | 128 | For example, in C mode @key{TAB} is bound to @code{c-indent-command}. |
| 129 | @kbd{C-j} is normally defined to do @key{RET} followed by @key{TAB}; | 129 | @kbd{C-j} is normally defined to do @key{RET} followed by @key{TAB}; |
| 130 | thus, it too indents in a mode-specific fashion. | 130 | thus, it too indents in a mode-specific fashion. |
| 131 | 131 | ||
| 132 | @kindex DEL @r{(programming modes)} | 132 | @kindex DEL @r{(programming modes)} |
| 133 | @findex backward-delete-char-untabify | 133 | @findex c-electric-backspace |
| 134 | In most programming languages, indentation is likely to vary from line to | 134 | In most programming languages, indentation is likely to vary from |
| 135 | line. So the major modes for those languages rebind @key{DEL} to treat a | 135 | line to line. So the major modes for those languages rebind @key{DEL} |
| 136 | tab as if it were the equivalent number of spaces (using the command | 136 | to treat a tab as if it were the equivalent number of spaces (using |
| 137 | @code{backward-delete-char-untabify}). This makes it possible to rub out | 137 | the command @code{c-electric-backspace}). This makes it possible to |
| 138 | indentation one column at a time without worrying whether it is made up of | 138 | rub out indentation one column at a time without worrying whether it |
| 139 | spaces or tabs. Use @kbd{C-b C-d} to delete a tab character before point, | 139 | is made up of spaces or tabs. Use @kbd{C-b C-d} to delete a tab |
| 140 | in these modes. | 140 | character before point, in these modes. |
| 141 | 141 | ||
| 142 | Programming language modes define paragraphs to be separated only by | 142 | Programming language modes define paragraphs to be separated only by |
| 143 | blank lines, so that the paragraph commands remain useful. Auto Fill mode, | 143 | blank lines, so that the paragraph commands remain useful. Auto Fill mode, |
| @@ -409,12 +409,12 @@ Equivalent to @key{RET} followed by @key{TAB} (@code{newline-and-indent}). | |||
| 409 | @end table | 409 | @end table |
| 410 | 410 | ||
| 411 | @kindex TAB @r{(programming modes)} | 411 | @kindex TAB @r{(programming modes)} |
| 412 | @findex c-indent-line | 412 | @findex c-indent-command |
| 413 | @findex lisp-indent-line | 413 | @findex indent-line-function |
| 414 | The basic indentation command is @key{TAB}, which gives the current line | 414 | The basic indentation command is @key{TAB}, which gives the current line |
| 415 | the correct indentation as determined from the previous lines. The | 415 | the correct indentation as determined from the previous lines. The |
| 416 | function that @key{TAB} runs depends on the major mode; it is @code{lisp-indent-line} | 416 | function that @key{TAB} runs depends on the major mode; it is @code{indent-for-tab-command} |
| 417 | in Lisp mode, @code{c-indent-line} in C mode, etc. These functions | 417 | in Lisp mode, @code{c-indent-command} in C mode, etc. These functions |
| 418 | understand different syntaxes for different languages, but they all do | 418 | understand different syntaxes for different languages, but they all do |
| 419 | about the same thing. @key{TAB} in any programming-language major mode | 419 | about the same thing. @key{TAB} in any programming-language major mode |
| 420 | inserts or deletes whitespace at the beginning of the current line, | 420 | inserts or deletes whitespace at the beginning of the current line, |