From 01b5d73b7916ba6119e579a149414f04e8059825 Mon Sep 17 00:00:00 2001 From: Dave Love Date: Thu, 26 Oct 2000 18:12:28 +0000 Subject: [PATCH] 2000-10-26 Dave Love * flow-fill.el: Require cl when compiling. 2000-10-26 Simon Josefsson * flow-fill.el (fill-flowed): Don't flow "-- " lines. (fill-flowed): Make "quote-depth wins" rule work when first line is at level 0. --- lisp/gnus/flow-fill.el | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/lisp/gnus/flow-fill.el b/lisp/gnus/flow-fill.el index 2a2db62c8b2..64946f9f040 100644 --- a/lisp/gnus/flow-fill.el +++ b/lisp/gnus/flow-fill.el @@ -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) -- 2.39.2