summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog7
-rw-r--r--lisp/textmodes/fill.el7
2 files changed, 10 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b4d5f159adf..daaeee3e93d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,4 +1,9 @@
-2007-10-15 Tom Horsley <tom.horsley@att.net>
+2007-10-18 Juanma Barranquero <lekktu@gmail.com>
+
+ * textmodes/fill.el (fill-individual-paragraphs): Doc fix.
+ (adaptive-fill-function): Doc fix. Remove * from docstring.
+
+2007-10-18 Tom Horsley <tom.horsley@att.net>
* simple.el (interprogram-paste-function): Doc fix.
(current-kill): Accept list of strings as well
diff --git a/lisp/textmodes/fill.el b/lisp/textmodes/fill.el
index cf52793f7b5..ad42845eb53 100644
--- a/lisp/textmodes/fill.el
+++ b/lisp/textmodes/fill.el
@@ -117,8 +117,8 @@ if it would act as a paragraph-starter on the second line."
:group 'fill)
(defcustom adaptive-fill-function nil
- "*Function to call to choose a fill prefix for a paragraph, or nil.
-nil means the function has not determined the fill prefix."
+ "Function to call to choose a fill prefix for a paragraph, or nil.
+A nil value means the function has not determined the fill prefix."
:type '(choice (const nil) function)
:group 'fill)
@@ -1359,7 +1359,7 @@ These lines are filled together.
When calling from a program, pass the range to fill
as the first two arguments.
-Optional third and fourth arguments JUSTIFY and MAIL-FLAG:
+Optional third and fourth arguments JUSTIFY and CITATION-REGEXP:
JUSTIFY to justify paragraphs (prefix arg),
When filling a mail message, pass a regexp for CITATION-REGEXP
which will match the prefix of a line which is a citation marker
@@ -1448,6 +1448,7 @@ Also, if CITATION-REGEXP is non-nil, don't fill header lines."
(fill-region-as-paragraph start (point) justify)
(if (and (bolp) (not had-newline))
(delete-char -1))))))))
+
(defun fill-individual-paragraphs-prefix (citation-regexp)
(let* ((adaptive-fill-first-line-regexp ".*")
(just-one-line-prefix