Commit 37657cbd authored by Lars Magne Ingebrigtsen's avatar Lars Magne Ingebrigtsen Committed by Katsumi Yamaoka
Browse files

flow-fill.el (fill-flowed-encode): Do encoding citation-aware.

gnus-art.el (gnus-treat-fill-long-lines): Add missing version tag.
gnus-msg.el (gnus-message-replyencrypt): Fix typo in version string.
parent fb9a573a
2011-01-03 Lars Magne Ingebrigtsen <larsi@gnus.org>
* flow-fill.el (fill-flowed-encode): Do encoding citation-aware.
2011-01-03 Glenn Morris <rgm@gnu.org> 2011-01-03 Glenn Morris <rgm@gnu.org>
   
* sieve-manage.el (sieve-manage-open): Correctly set sieve-manage-port. * sieve-manage.el (sieve-manage-open): Correctly set sieve-manage-port.
......
;;; flow-fill.el --- interpret RFC2646 "flowed" text ;;; flow-fill.el --- interpret RFC2646 "flowed" text
;; Copyright (C) 2000, 2001, 2002, 2003, 2004, ;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. ;; 2009, 2010, 2011 Free Software Foundation, Inc.
;; Author: Simon Josefsson <jas@pdc.kth.se> ;; Author: Simon Josefsson <jas@pdc.kth.se>
;; Keywords: mail ;; Keywords: mail
...@@ -82,19 +82,38 @@ RFC 2646 suggests 66 characters for readability." ...@@ -82,19 +82,38 @@ RFC 2646 suggests 66 characters for readability."
;; Go through each paragraph, filling it and adding SPC ;; Go through each paragraph, filling it and adding SPC
;; as the last character on each line. ;; as the last character on each line.
(while (setq end (text-property-any start (point-max) 'hard 't)) (while (setq end (text-property-any start (point-max) 'hard 't))
(let ((fill-column (eval fill-flowed-encode-column))) (save-restriction
(fill-region start end t 'nosqueeze 'to-eop)) (narrow-to-region start end)
(goto-char start) (let ((fill-column (eval fill-flowed-encode-column)))
;; `fill-region' probably distorted end. (fill-flowed-fill-buffer))
(setq end (text-property-any start (point-max) 'hard 't)) (goto-char (point-min))
(while (and (< (point) end) (while (re-search-forward "\n" nil t)
(re-search-forward "$" (1- end) t)) (replace-match " \n" t t))
(insert " ") (goto-char (setq start (1+ (point-max)))))))
(setq end (1+ end))
(forward-char))
(goto-char (setq start (1+ end)))))
t))) t)))
(defun fill-flowed-fill-buffer ()
(let ((prefix nil)
(prev-prefix nil)
(start (point-min)))
(goto-char (point-min))
(while (not (eobp))
(setq prefix (and (looking-at "[> ]+")
(match-string 0)))
(if (equal prefix prev-prefix)
(forward-line 1)
(save-restriction
(narrow-to-region start (point))
(let ((fill-prefix prev-prefix))
(fill-region (point-min) (point-max) t 'nosqueeze 'to-eop))
(goto-char (point-max)))
(setq prev-prefix prefix
start (point))))
(save-restriction
(narrow-to-region start (point))
(let ((fill-prefix prev-prefix))
(fill-region (point-min) (point-max) t 'nosqueeze 'to-eop)))))
;;;###autoload ;;;###autoload
(defun fill-flowed (&optional buffer delete-space) (defun fill-flowed (&optional buffer delete-space)
(with-current-buffer (or (current-buffer) buffer) (with-current-buffer (or (current-buffer) buffer)
......
;;; gnus-art.el --- article mode commands for Gnus ;;; gnus-art.el --- article mode commands for Gnus
;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, ;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. ;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; Keywords: news ;; Keywords: news
...@@ -1594,6 +1594,7 @@ predicate. See Info node `(gnus)Customizing Articles'." ...@@ -1594,6 +1594,7 @@ predicate. See Info node `(gnus)Customizing Articles'."
"Fill long lines. "Fill long lines.
Valid values are nil, t, `head', `first', `last', an integer or a Valid values are nil, t, `head', `first', `last', an integer or a
predicate. See Info node `(gnus)Customizing Articles'." predicate. See Info node `(gnus)Customizing Articles'."
:version "24.1"
:group 'gnus-article-treat :group 'gnus-article-treat
:link '(custom-manual "(gnus)Customizing Articles") :link '(custom-manual "(gnus)Customizing Articles")
:type gnus-article-treat-custom) :type gnus-article-treat-custom)
......
...@@ -247,7 +247,7 @@ See also the `mml-default-sign-method' variable." ...@@ -247,7 +247,7 @@ See also the `mml-default-sign-method' variable."
(defcustom gnus-message-replyencrypt t (defcustom gnus-message-replyencrypt t
"Automatically encrypt replies to encrypted messages. "Automatically encrypt replies to encrypted messages.
See also the `mml-default-encrypt-method' variable." See also the `mml-default-encrypt-method' variable."
:version "22.1" :version "24.1"
:group 'gnus-message :group 'gnus-message
:type 'boolean) :type 'boolean)
......
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