(format-deannotate-region): Doc fix.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b309e920fc9611119264eeebbe400c335455b8ba..cccbd3a177020ef0b7422be6ce8f89ae65f2f974 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,13 @@
 2002-04-03  Richard M. Stallman  <rms@gnu.org>
 
+       * format.el (format-deannotate-region): Doc fix.
+
+       * enriched.el (enriched-face-ans): Delete special treatment
+       for fg:... and bg:... faces.
+       (enriched-decode-foreground): Return a list that specifies
+       the foreground color, rather than creating a face.
+       (enriched-decode-background): Likewise.
+
        * shell.el (shell-mode): Don't reinit comint-input-ring
        if that was already done.
 

diff --git a/lisp/format.el b/lisp/format.el
index d5b4c859d8aef2e8c0cd77b4e65a36be2c99fe02..e8298a5d47ad51d3b0dfa286e98f85f67ff2568c 100644 (file)
--- a/lisp/format.el
+++ b/lisp/format.el
@@ -565,12 +565,15 @@ the TRANSLATIONS list: PARAMETER and FUNCTION \(spelled in uppercase).
 Annotations listed under the pseudo-property PARAMETER are considered to be
 arguments of the immediately surrounding annotation; the text between the
 opening and closing parameter annotations is deleted from the buffer but saved
-as a string.  The surrounding annotation should be listed under the
-pseudo-property FUNCTION.  Instead of inserting a text-property for this
-annotation, the function listed in the VALUE slot is called to make whatever
-changes are appropriate.  The function's first two arguments are the START and
-END locations, and the rest of the arguments are any PARAMETERs found in that
-region.
+as a string.
+
+The surrounding annotation should be listed under the pseudo-property
+FUNCTION.  Instead of inserting a text-property for this annotation,
+the function listed in the VALUE slot is called to make whatever
+changes are appropriate.  It can also return a list of the form
+\(START LOC PROP VALUE) which specifies a property to put on.  The
+function's first two arguments are the START and END locations, and
+the rest of the arguments are any PARAMETERs found in that region.
 
 Any annotations that are found by NEXT-FN but not defined by TRANSLATIONS
 are saved as values of the `unknown' text-property \(which is list-valued).