projects
/
gnus
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Accept the moronic openssl s_client -starttls output, too.
[gnus]
/
lisp
/
flow-fill.el
diff --git
a/lisp/flow-fill.el
b/lisp/flow-fill.el
index
e54100a
..
2420577
100644
(file)
--- a/
lisp/flow-fill.el
+++ b/
lisp/flow-fill.el
@@
-1,17
+1,17
@@
;;; flow-fill.el --- interpret RFC2646 "flowed" text
;; Copyright (C) 2000, 2001, 2002, 2003, 2004,
;;; flow-fill.el --- interpret RFC2646 "flowed" text
;; Copyright (C) 2000, 2001, 2002, 2003, 2004,
-;; 2005, 2006 Free Software Foundation, Inc.
+;; 2005, 2006
, 2007, 2008, 2009, 2010
Free Software Foundation, Inc.
;; Author: Simon Josefsson <jas@pdc.kth.se>
;; Keywords: mail
;; This file is part of GNU Emacs.
;; Author: Simon Josefsson <jas@pdc.kth.se>
;; Keywords: mail
;; This file is part of GNU Emacs.
-;; GNU Emacs is free software
;
you can redistribute it and/or modify
+;; GNU Emacs is free software
:
you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation
; either version 2, or (at your option)
-;; any later version.
+;; the Free Software Foundation
, either version 3 of the License, or
+;;
(at your option)
any later version.
;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-19,9
+19,7
@@
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
;;; Commentary:
;;; Commentary:
@@
-98,16
+96,17
@@
RFC 2646 suggests 66 characters for readability."
t)))
;;;###autoload
t)))
;;;###autoload
-(defun fill-flowed (&optional buffer)
- (save-excursion
- (set-buffer (or (current-buffer) buffer))
+(defun fill-flowed (&optional buffer delete-space)
+ (with-current-buffer (or (current-buffer) buffer)
(goto-char (point-min))
;; Remove space stuffing.
(goto-char (point-min))
;; Remove space stuffing.
- (while (re-search-forward "^
" nil t)
+ (while (re-search-forward "^
\\( \\|>+ $\\)
" nil t)
(delete-char -1)
(forward-line 1))
(goto-char (point-min))
(while (re-search-forward " $" nil t)
(delete-char -1)
(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 "^\\(>*\\)\\( ?\\)"))
(when (save-excursion
(beginning-of-line)
(looking-at "^\\(>*\\)\\( ?\\)"))
@@
-152,8
+151,7
@@
RFC 2646 suggests 66 characters for readability."
;; Test vectors.
;; Test vectors.
-(eval-when-compile
- (defvar show-trailing-whitespace))
+(defvar show-trailing-whitespace)
(defvar fill-flowed-encode-tests
`(
(defvar fill-flowed-encode-tests
`(
@@
-222,5
+220,4
@@
RFC 2646 suggests 66 characters for readability."
(provide 'flow-fill)
(provide 'flow-fill)
-;;; arch-tag: addc0040-bc53-4f17-b4bc-1eb44eed6f0b
;;; flow-fill.el ends here
;;; flow-fill.el ends here