comparison lisp/textmodes/fill.el @ 12557:34e9427fe8f5

(canonically-space-region): Doc fix. (fill-region-as-paragraph): In adaptive-fill-mode, if paragraph has one line, take the fill prefix from it. (adaptive-fill-regexp): Doc fix. (fill-individual-paragraphs): Use `adaptive-fill-regexp' to determine `fill-prefix' if `adaptive-fill-mode' is non-nil.

12556:fb1b760f6636

(defconst adaptive-fill-regexp "[ \t]*\\([#;>*]+ +\\)?"
  "*Regexp to match text at start of line that constitutes indentation.
If Adaptive Fill mode is enabled, whatever text matches this pattern
on the second line of a paragraph is used as the standard indentation
for the paragraph.")

(defun current-fill-column ()
  "Return the fill-column to use for this line.
The fill-column to use for a buffer is stored in the variable `fill-column',
but can be locally modified by the `right-margin' text property, which is

	  (max here-col fill-col)))))

(defun canonically-space-region (beg end)
  "Remove extra spaces between words in region.
Puts one space between words in region; two between sentences.
Remove indenation from each line."
  (interactive "r")
  (save-excursion
    (goto-char beg)
    ;; Nuke tabs; they get screwed up in a fill.
    ;; This is quick, but loses when a tab follows the end of a sentence.

      (if (and adaptive-fill-mode
	       (or (null fill-prefix) (string= fill-prefix "")))
	  (save-excursion
	    (goto-char from)
	    (if (eolp) (forward-line 1))
	    (forward-line 1)
	    (move-to-left-margin)
	    (if (< (point) to)
		(let ((start (point)))
		  (re-search-forward adaptive-fill-regexp)
		  (setq fill-prefix (buffer-substring start (point)))
		  (set-text-properties 0 (length fill-prefix) nil
				       fill-prefix)))
	    ;; If paragraph has only one line, don't assume in general
	    ;; that additional lines would have the same starting
	    ;; decoration.  Assume no indentation.
	    ))

      (save-restriction
	(goto-char from)
	(beginning-of-line)

		   ;; Update the fill-prefix on the first line
		   ;; and whenever the prefix good so far is too long.
		   (if (not (and fill-prefix
				 (looking-at fill-prefix-regexp)))
		       (setq fill-prefix
			     (buffer-substring (point)
					       (save-excursion (skip-chars-forward " \t") (point)))
			     fill-prefix-regexp
			     (regexp-quote fill-prefix)))
		   (forward-line 1)
		   ;; Now stop the loop if end of paragraph.
		   (and (not (eobp))

12557:34e9427fe8f5

(defconst adaptive-fill-regexp "[ \t]*\\([#;>*]+ +\\)?"
  "*Regexp to match text at start of line that constitutes indentation.
If Adaptive Fill mode is enabled, whatever text matches this pattern
on the second line of a paragraph is used as the standard indentation
for the paragraph.  If the paragraph has just one line, the indentation
is taken from that line.")

(defun current-fill-column ()
  "Return the fill-column to use for this line.
The fill-column to use for a buffer is stored in the variable `fill-column',
but can be locally modified by the `right-margin' text property, which is

	  (max here-col fill-col)))))

(defun canonically-space-region (beg end)
  "Remove extra spaces between words in region.
Puts one space between words in region; two between sentences.
Remove indentation from each line."
  (interactive "r")
  (save-excursion
    (goto-char beg)
    ;; Nuke tabs; they get screwed up in a fill.
    ;; This is quick, but loses when a tab follows the end of a sentence.

      (if (and adaptive-fill-mode
	       (or (null fill-prefix) (string= fill-prefix "")))
	  (save-excursion
	    (goto-char from)
	    (if (eolp) (forward-line 1))
	    ;; Move to the second line unless there is just one.
	    (let ((firstline (point)))
	      (forward-line 1)
	      (if (>= (point) to)
		  (goto-char firstline)))
	    (move-to-left-margin)
	    (let ((start (point)))
	      (re-search-forward adaptive-fill-regexp)
	      (setq fill-prefix (buffer-substring start (point)))
	      (set-text-properties 0 (length fill-prefix) nil
				   fill-prefix))
	    ))

      (save-restriction
	(goto-char from)
	(beginning-of-line)

		   ;; Update the fill-prefix on the first line
		   ;; and whenever the prefix good so far is too long.
		   (if (not (and fill-prefix
				 (looking-at fill-prefix-regexp)))
		       (setq fill-prefix
			     (if (and adaptive-fill-mode adaptive-fill-regexp
				      (looking-at (concat "\\(" adaptive-fill-regexp "\\)")))
				 (match-string 1)
			       (buffer-substring (point)
						 (save-excursion (skip-chars-forward " \t") (point))))
			     fill-prefix-regexp
			     (regexp-quote fill-prefix)))
		   (forward-line 1)
		   ;; Now stop the loop if end of paragraph.
		   (and (not (eobp))