Commit e4b7444d authored by Stefan Monnier's avatar Stefan Monnier
Browse files

(fill) <defgroup>: Move from cus-edit.el.

(enable-kinsoku): Make it a defcustom.
(fill-comment-paragraph): Don't rely on fill-prefix to bound the
paragraph to same-comment-start-marker.
parent 7d46398a
......@@ -30,6 +30,11 @@
;;; Code:
(defgroup fill nil
"Indenting and filling text."
:link '(custom-manual "(emacs)Filling Text")
:group 'editing)
(defcustom fill-individual-varying-indent nil
"*Controls criterion for a new paragraph in `fill-individual-paragraphs'.
Non-nil means changing indent doesn't end a paragraph.
......@@ -49,13 +54,14 @@ A value of nil means that any change in indentation starts a new paragraph."
If the function returns nil, then `fill-paragraph' does its normal work.")
(defvar fill-paragraph-handle-comment t
"If non-nil, paragraph filling will try to pay attention to comments.")
"Non-nil means paragraph filling will try to pay attention to comments.")
(defvar enable-kinsoku t
"*Non-nil means enable \"kinsoku\" processing on filling paragraph.
(defcustom enable-kinsoku t
"*Non-nil means enable \"kinsoku\" processing on filling paragraphs.
Kinsoku processing is designed to prevent certain characters from being
placed at the beginning or end of a line by filling.
See the documentation of `kinsoku' for more information.")
See the documentation of `kinsoku' for more information."
:type 'boolean)
(defun set-fill-prefix ()
"Set the fill prefix to the current line up to point.
......@@ -317,7 +323,7 @@ be tested. If it returns t, fill commands do not break the line there."
:options '(fill-french-nobreak-p fill-single-word-nobreak-p))
(defcustom fill-nobreak-invisible nil
"Non-nil means that fill command do not break lines in invisible text."
"Non-nil means that fill commands do not break lines in invisible text."
:type 'boolean
:group 'fill)
......@@ -365,7 +371,7 @@ and `fill-nobreak-invisible'."
Don't move back past the buffer position LIMIT.
This function is called when we are going to break the current line
after or before a non-ascii character. If the charset of the
after or before a non-ASCII character. If the charset of the
character has the property `fill-find-break-point-function', this
function calls the property value as a function with one arg LINEBEG.
If the charset has no such property, do nothing."
......@@ -428,7 +434,7 @@ Point is moved to just past the fill prefix on the first line."
(string-to-list sentence-end-without-space)))
(while (re-search-forward eol-double-space-re to t)
(or (>= (point) to) (memq (char-before) '(?\t ?\ ))
(memq (char-after (match-beginning 0))
(memq (char-after (match-beginning 0))
sentence-end-without-space-list)
(insert-and-inherit ?\ ))))
......@@ -844,8 +850,13 @@ can take care of filling. JUSTIFY is used as in `fill-paragraph'."
(concat paragraph-start "\\|[ \t]*\\(?:"
comment-start-skip "\\)\\(?:"
(default-value 'paragraph-start) "\\)"))
(paragraph-ignore-fill-prefix nil)
(fill-prefix comment-fill-prefix)
;; We used to reply on fill-prefix to break paragraph at
;; comment-starter changes, but it did not work for the
;; first line (mixed comment&code).
;; We now use comment-re instead to "manually" make sure
;; we treat comment-marker changes as paragraph boundaries.
;; (paragraph-ignore-fill-prefix nil)
;; (fill-prefix comment-fill-prefix)
(after-line (if has-code-and-comment
(line-beginning-position 2))))
(setq end (progn (forward-paragraph) (point)))
......@@ -892,7 +903,7 @@ as specified by its text properties.
The fourth arg NOSQUEEZE non-nil means to leave
whitespace other than line breaks untouched, and fifth arg TO-EOP
non-nil means to keep filling to the end of the paragraph (or next
hard newline, if `use-hard-newlines' is on).
hard newline, if variable `use-hard-newlines' is on).
Return the fill-prefix used for filling the last paragraph.
......@@ -976,8 +987,8 @@ beginning and end of the region are not at paragraph breaks, they are
moved to the beginning and end \(respectively) of the paragraphs they
are in.
If `use-hard-newlines' is true, all hard newlines are taken to be paragraph
breaks.
If variable `use-hard-newlines' is true, all hard newlines are
taken to be paragraph breaks.
When calling from a program, operates just on region between BEGIN and END,
unless optional fourth arg WHOLE-PAR is non-nil. In that case bounds are
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment