Commit 01b5d73b authored by Dave Love's avatar Dave Love
Browse files

2000-10-26 Dave Love <fx@gnu.org>

	* flow-fill.el: Require cl when compiling.

2000-10-26  Simon Josefsson  <simon@josefsson.org>

	* flow-fill.el (fill-flowed): Don't flow "-- " lines.
	(fill-flowed): Make "quote-depth wins" rule work when first line
	is at level 0.
parent fc7bf263
......@@ -35,7 +35,8 @@
;; paragraph and we let `fill-region' fill the long line into several
;; lines with the quote prefix as `fill-prefix'.
;; Todo: encoding
;; Todo: encoding, implement basic `fill-region' (Emacs and XEmacs
;; implementations differ..)
;; History:
......@@ -43,16 +44,20 @@
;; 2000-02-19 use `point-at-{b,e}ol' in XEmacs
;; 2000-03-11 no compile warnings for point-at-bol stuff
;; 2000-03-26 commited to gnus cvs
;; 2000-10-23 don't flow "-- " lines, make "quote-depth wins" rule
;; work when first line is at level 0.
;;; Code:
(eval-when-compile (require 'cl))
(eval-and-compile
(defalias 'fill-flowed-point-at-bol
(if (fboundp 'point-at-bol)
'point-at-bol
'line-beginning-position))
(defalias 'fill-flowed-point-at-eol
(defalias 'fill-flowed-point-at-eol
(if (fboundp 'point-at-eol)
'point-at-eol
'line-end-position)))
......@@ -65,7 +70,7 @@
(when (save-excursion
(beginning-of-line)
(looking-at "^\\(>*\\)\\( ?\\)"))
(let ((quote (match-string 1)))
(let ((quote (match-string 1)) sig)
(if (string= quote "")
(setq quote nil))
(when (and quote (string= (match-string 2) ""))
......@@ -75,23 +80,23 @@
(when (> (skip-chars-forward ">") 0)
(insert " "))))
(while (and (save-excursion
(backward-char 3)
(ignore-errors (backward-char 3))
(setq sig (looking-at "-- "))
(looking-at "[^-][^-] "))
(save-excursion
(unless (eobp)
(forward-char 1)
(if quote
(looking-at (format "^\\(%s\\)\\([^>]\\)" quote))
(looking-at "^ ?")))))
(looking-at (format "^\\(%s\\)\\([^>]\\)" (or quote " ?"))))))
(save-excursion
(replace-match (if (string= (match-string 2) " ")
"" "\\2")))
(backward-delete-char -1)
(end-of-line))
(let ((fill-prefix (when quote (concat quote " "))))
(fill-region (fill-flowed-point-at-bol)
(fill-flowed-point-at-eol)
'left 'nosqueeze)))))))
(unless sig
(let ((fill-prefix (when quote (concat quote " "))))
(fill-region (fill-flowed-point-at-bol)
(fill-flowed-point-at-eol)
'left 'nosqueeze))))))))
(provide 'flow-fill)
......
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