Mercurial > emacs
comparison lisp/gnus/flow-fill.el @ 112432:27320025ed54
Merge chages made in Gnus trunk.
mailcap.el (mailcap-mime-extensions): Rename text/org to text/x-org.
gnus-draft.el (gnus-group-send-queue): Update the queue group in the group buffer after sending the queue.
gnus-draft.el (gnus-group-send-queue): Really refresh the queue group after sending.
gnus-agent.el (gnus-agent-send-mail): Ditto.
gnus-group.el (gnus-group-refresh-group): New convenience function.
message.el (message-bogus-addresses): Remove commented-out value.
message.el (message-check-recipients): Display the encoded version of the bogus address if they differ.
flow-fill.el (fill-flowed): Make `delete-space' option correspond to "DelSp" parameter in RFC3676.
gnus-sum.el (gnus-summary-move-article): Protect against backends (i.e., nnimap) returning nil as the article number.
| author | Katsumi Yamaoka <yamaoka@jpl.org> |
|---|---|
| date | Sun, 23 Jan 2011 00:34:08 +0000 |
| parents | 61f7601898b1 |
| children |
comparison
equal
deleted
inserted
replaced
| 112431:7a578da192b9 | 112432:27320025ed54 |
|---|---|
| 122 (while (re-search-forward "^\\( \\|>+ $\\)" nil t) | 122 (while (re-search-forward "^\\( \\|>+ $\\)" nil t) |
| 123 (delete-char -1) | 123 (delete-char -1) |
| 124 (forward-line 1)) | 124 (forward-line 1)) |
| 125 (goto-char (point-min)) | 125 (goto-char (point-min)) |
| 126 (while (re-search-forward " $" nil t) | 126 (while (re-search-forward " $" nil t) |
| 127 (when delete-space | |
| 128 (delete-char -1)) | |
| 129 (when (save-excursion | 127 (when (save-excursion |
| 130 (beginning-of-line) | 128 (beginning-of-line) |
| 131 (looking-at "^\\(>*\\)\\( ?\\)")) | 129 (looking-at "^\\(>*\\)\\( ?\\)")) |
| 132 (let ((quote (match-string 1)) | 130 (let ((quote (match-string 1)) |
| 133 sig) | 131 sig) |
| 151 (or quote " ?")))))) | 149 (or quote " ?")))))) |
| 152 (save-excursion | 150 (save-excursion |
| 153 (replace-match (if (string= (match-string 2) " ") | 151 (replace-match (if (string= (match-string 2) " ") |
| 154 "" "\\2"))) | 152 "" "\\2"))) |
| 155 (backward-delete-char -1) | 153 (backward-delete-char -1) |
| 154 (when delete-space | |
| 155 (delete-char -1)) | |
| 156 (end-of-line)) | 156 (end-of-line)) |
| 157 (unless sig | 157 (unless sig |
| 158 (condition-case nil | 158 (condition-case nil |
| 159 (let ((fill-prefix (when quote (concat quote " "))) | 159 (let ((fill-prefix (when quote (concat quote " "))) |
| 160 (fill-column (eval fill-flowed-display-column)) | 160 (fill-column (eval fill-flowed-display-column)) |