aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman2002-04-03 15:29:25 +0000
committerRichard M. Stallman2002-04-03 15:29:25 +0000
commit92308d3a2af481d69783a0984d3eac067414bb71 (patch)
treee326ca6070c6dd15bb14a64e232995b5667f3b7a
parentae8f92579cbbf873dcbef1fad931cd4f2797ea31 (diff)
downloademacs-92308d3a2af481d69783a0984d3eac067414bb71.tar.gz
emacs-92308d3a2af481d69783a0984d3eac067414bb71.zip
(format-deannotate-region): Doc fix.
-rw-r--r--lisp/ChangeLog8
-rw-r--r--lisp/format.el15
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 @@
12002-04-03 Richard M. Stallman <rms@gnu.org> 12002-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).
565Annotations listed under the pseudo-property PARAMETER are considered to be 565Annotations listed under the pseudo-property PARAMETER are considered to be
566arguments of the immediately surrounding annotation; the text between the 566arguments of the immediately surrounding annotation; the text between the
567opening and closing parameter annotations is deleted from the buffer but saved 567opening and closing parameter annotations is deleted from the buffer but saved
568as a string. The surrounding annotation should be listed under the 568as a string.
569pseudo-property FUNCTION. Instead of inserting a text-property for this 569
570annotation, the function listed in the VALUE slot is called to make whatever 570The surrounding annotation should be listed under the pseudo-property
571changes are appropriate. The function's first two arguments are the START and 571FUNCTION. Instead of inserting a text-property for this annotation,
572END locations, and the rest of the arguments are any PARAMETERs found in that 572the function listed in the VALUE slot is called to make whatever
573region. 573changes are appropriate. It can also return a list of the form
574\(START LOC PROP VALUE) which specifies a property to put on. The
575function's first two arguments are the START and END locations, and
576the rest of the arguments are any PARAMETERs found in that region.
574 577
575Any annotations that are found by NEXT-FN but not defined by TRANSLATIONS 578Any annotations that are found by NEXT-FN but not defined by TRANSLATIONS
576are saved as values of the `unknown' text-property \(which is list-valued). 579are saved as values of the `unknown' text-property \(which is list-valued).