diff options
| author | Richard M. Stallman | 2002-04-03 15:29:25 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 2002-04-03 15:29:25 +0000 |
| commit | 92308d3a2af481d69783a0984d3eac067414bb71 (patch) | |
| tree | e326ca6070c6dd15bb14a64e232995b5667f3b7a | |
| parent | ae8f92579cbbf873dcbef1fad931cd4f2797ea31 (diff) | |
| download | emacs-92308d3a2af481d69783a0984d3eac067414bb71.tar.gz emacs-92308d3a2af481d69783a0984d3eac067414bb71.zip | |
(format-deannotate-region): Doc fix.
| -rw-r--r-- | lisp/ChangeLog | 8 | ||||
| -rw-r--r-- | lisp/format.el | 15 |
2 files changed, 17 insertions, 6 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b309e920fc9..cccbd3a1770 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,13 @@ | |||
| 1 | 2002-04-03 Richard M. Stallman <rms@gnu.org> | 1 | 2002-04-03 Richard M. Stallman <rms@gnu.org> |
| 2 | 2 | ||
| 3 | * format.el (format-deannotate-region): Doc fix. | ||
| 4 | |||
| 5 | * enriched.el (enriched-face-ans): Delete special treatment | ||
| 6 | for fg:... and bg:... faces. | ||
| 7 | (enriched-decode-foreground): Return a list that specifies | ||
| 8 | the foreground color, rather than creating a face. | ||
| 9 | (enriched-decode-background): Likewise. | ||
| 10 | |||
| 3 | * shell.el (shell-mode): Don't reinit comint-input-ring | 11 | * shell.el (shell-mode): Don't reinit comint-input-ring |
| 4 | if that was already done. | 12 | if that was already done. |
| 5 | 13 | ||
diff --git a/lisp/format.el b/lisp/format.el index d5b4c859d8a..e8298a5d47a 100644 --- a/lisp/format.el +++ b/lisp/format.el | |||
| @@ -565,12 +565,15 @@ the TRANSLATIONS list: PARAMETER and FUNCTION \(spelled in uppercase). | |||
| 565 | Annotations listed under the pseudo-property PARAMETER are considered to be | 565 | Annotations listed under the pseudo-property PARAMETER are considered to be |
| 566 | arguments of the immediately surrounding annotation; the text between the | 566 | arguments of the immediately surrounding annotation; the text between the |
| 567 | opening and closing parameter annotations is deleted from the buffer but saved | 567 | opening and closing parameter annotations is deleted from the buffer but saved |
| 568 | as a string. The surrounding annotation should be listed under the | 568 | as a string. |
| 569 | pseudo-property FUNCTION. Instead of inserting a text-property for this | 569 | |
| 570 | annotation, the function listed in the VALUE slot is called to make whatever | 570 | The surrounding annotation should be listed under the pseudo-property |
| 571 | changes are appropriate. The function's first two arguments are the START and | 571 | FUNCTION. Instead of inserting a text-property for this annotation, |
| 572 | END locations, and the rest of the arguments are any PARAMETERs found in that | 572 | the function listed in the VALUE slot is called to make whatever |
| 573 | region. | 573 | changes are appropriate. It can also return a list of the form |
| 574 | \(START LOC PROP VALUE) which specifies a property to put on. The | ||
| 575 | function's first two arguments are the START and END locations, and | ||
| 576 | the rest of the arguments are any PARAMETERs found in that region. | ||
| 574 | 577 | ||
| 575 | Any annotations that are found by NEXT-FN but not defined by TRANSLATIONS | 578 | Any annotations that are found by NEXT-FN but not defined by TRANSLATIONS |
| 576 | are saved as values of the `unknown' text-property \(which is list-valued). | 579 | are saved as values of the `unknown' text-property \(which is list-valued). |