aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2007-10-18 13:27:04 +0000
committerJuanma Barranquero2007-10-18 13:27:04 +0000
commit3e4dfbb6bd727b604cdc4b989772becd0d6a3664 (patch)
treeffe422e44cbc9996758f4bb0677c74a2c7ce6267
parent539f5bdad231f4bd7a195427790207abefb7b2cf (diff)
downloademacs-3e4dfbb6bd727b604cdc4b989772becd0d6a3664.tar.gz
emacs-3e4dfbb6bd727b604cdc4b989772becd0d6a3664.zip
(fill-individual-paragraphs): Doc fix.
(adaptive-fill-function): Doc fix. Remove * from docstring.
-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 @@
12007-10-15 Tom Horsley <tom.horsley@att.net> 12007-10-18 Juanma Barranquero <lekktu@gmail.com>
2
3 * textmodes/fill.el (fill-individual-paragraphs): Doc fix.
4 (adaptive-fill-function): Doc fix. Remove * from docstring.
5
62007-10-18 Tom Horsley <tom.horsley@att.net>
2 7
3 * simple.el (interprogram-paste-function): Doc fix. 8 * simple.el (interprogram-paste-function): Doc fix.
4 (current-kill): Accept list of strings as well 9 (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."
117 :group 'fill) 117 :group 'fill)
118 118
119(defcustom adaptive-fill-function nil 119(defcustom adaptive-fill-function nil
120 "*Function to call to choose a fill prefix for a paragraph, or nil. 120 "Function to call to choose a fill prefix for a paragraph, or nil.
121nil means the function has not determined the fill prefix." 121A nil value means the function has not determined the fill prefix."
122 :type '(choice (const nil) function) 122 :type '(choice (const nil) function)
123 :group 'fill) 123 :group 'fill)
124 124
@@ -1359,7 +1359,7 @@ These lines are filled together.
1359When calling from a program, pass the range to fill 1359When calling from a program, pass the range to fill
1360as the first two arguments. 1360as the first two arguments.
1361 1361
1362Optional third and fourth arguments JUSTIFY and MAIL-FLAG: 1362Optional third and fourth arguments JUSTIFY and CITATION-REGEXP:
1363JUSTIFY to justify paragraphs (prefix arg), 1363JUSTIFY to justify paragraphs (prefix arg),
1364When filling a mail message, pass a regexp for CITATION-REGEXP 1364When filling a mail message, pass a regexp for CITATION-REGEXP
1365which will match the prefix of a line which is a citation marker 1365which 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."
1448 (fill-region-as-paragraph start (point) justify) 1448 (fill-region-as-paragraph start (point) justify)
1449 (if (and (bolp) (not had-newline)) 1449 (if (and (bolp) (not had-newline))
1450 (delete-char -1)))))))) 1450 (delete-char -1))))))))
1451
1451(defun fill-individual-paragraphs-prefix (citation-regexp) 1452(defun fill-individual-paragraphs-prefix (citation-regexp)
1452 (let* ((adaptive-fill-first-line-regexp ".*") 1453 (let* ((adaptive-fill-first-line-regexp ".*")
1453 (just-one-line-prefix 1454 (just-one-line-prefix