[Emacs-diffs] Changes to emacs/lisp/gnus/flow-fill.el,v

[Miles Bader]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Miles Bader <miles>     07/10/28 09:18:40

Index: lisp/gnus/flow-fill.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/gnus/flow-fill.el,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- lisp/gnus/flow-fill.el      26 Jul 2007 05:26:56 -0000      1.18
+++ lisp/gnus/flow-fill.el      28 Oct 2007 09:18:26 -0000      1.19
@@ -75,17 +75,6 @@
                 (sexp)
                 (integer)))
 
-(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
-       (if (fboundp 'point-at-eol)
-           'point-at-eol
-         'line-end-position)))
-
 ;;;###autoload
 (defun fill-flowed-encode (&optional buffer)
   (with-current-buffer (or buffer (current-buffer))
@@ -109,7 +98,7 @@
       t)))
 
 ;;;###autoload
-(defun fill-flowed (&optional buffer)
+(defun fill-flowed (&optional buffer delete-space)
   (save-excursion
     (set-buffer (or (current-buffer) buffer))
     (goto-char (point-min))
@@ -119,6 +108,8 @@
       (forward-line 1))
     (goto-char (point-min))
     (while (re-search-forward " $" nil t)
+      (when delete-space
+       (delete-char -1))
       (when (save-excursion
              (beginning-of-line)
              (looking-at "^\\(>*\\)\\( ?\\)"))
@@ -153,8 +144,8 @@
                      (fill-column (eval fill-flowed-display-column))
                      filladapt-mode
                      adaptive-fill-mode)
-                 (fill-region (fill-flowed-point-at-bol)
-                              (min (1+ (fill-flowed-point-at-eol))
+                 (fill-region (point-at-bol)
+                              (min (1+ (point-at-eol))
                                    (point-max))
                               'left 'nosqueeze))
              (error