2 files changed, 10 insertions, 0 deletions

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 82393f475f7..e5097a4d172 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,7 @@
+2007-10-06  Juri Linkov  <juri@jurta.org>
+
+        * text.texi (Filling): Document fill-paragraph-or-region.
+
 2007-10-05  Juanma Barranquero  <lekktu@gmail.com>
 
         * display.texi (Auto Faces): Fix typo.
diff --git a/doc/lispref/text.texi b/doc/lispref/text.texi
index 22820d75582..c6da06b4a13 100644
--- a/doc/lispref/text.texi
+++ b/doc/lispref/text.texi
@@ -1453,6 +1453,12 @@ The variable @code{paragraph-separate} controls how to distinguish
 paragraphs.  @xref{Standard Regexps}.
 @end deffn
 
+@deffn Command fill-paragraph-or-region justify
+In Transient Mark mode, when the mark is active, this command calls
+@code{fill-region} on the active region.  Otherwise, it calls
+@code{fill-paragraph}.
+@end deffn
+
 @deffn Command fill-individual-paragraphs start end &optional justify citation-regexp
 This command fills each paragraph in the region according to its
 individual fill prefix.  Thus, if the lines of a paragraph were indented