summaryrefslogtreecommitdiff
path: root/lisp/gnus/gnus-cite.el
diff options
context:
space:
mode:
authorLars Magne Ingebrigtsen <larsi@gnus.org>2010-11-01 22:21:10 +0000
committerKatsumi Yamaoka <yamaoka@jpl.org>2010-11-01 22:21:10 +0000
commit9310f19da1b42a9da2f4cde15e605d04b9420655 (patch)
tree3185d2ba0f1b092ba45c661a82e88bba9a185d16 /lisp/gnus/gnus-cite.el
parent91fd0b72816c99c0425ab783f6502a3e11f00956 (diff)
downloademacs-9310f19da1b42a9da2f4cde15e605d04b9420655.tar.gz
Merge changes made in Gnus trunk.
nnimap.el (nnimap-parse-line): Don't bug out oddly formed replies (bug #7311). gnus-cite.el (gnus-article-fill-cited-article): Minimize the long-lines case by only filling the long lines. gnus-start.el (gnus-ask-server-for-new-groups): Return the new groups. gnus-group.el (gnus-group-find-new-groups): Display all the new groups. gnus-start.el (gnus-find-new-newsgroups): Return the list of new groups. nnimap.el (nnimap-request-group): Store the new updated info. nnimap.el (nnimap-request-group): Select the group when we don't know whether it exists or not.
Diffstat (limited to 'lisp/gnus/gnus-cite.el')
-rw-r--r--lisp/gnus/gnus-cite.el11
1 files changed, 10 insertions, 1 deletions
diff --git a/lisp/gnus/gnus-cite.el b/lisp/gnus/gnus-cite.el
index a010a833e9d..2d44e36258a 100644
--- a/lisp/gnus/gnus-cite.el
+++ b/lisp/gnus/gnus-cite.el
@@ -545,7 +545,16 @@ longer than the frame width."
(unless do-fill
(setq do-fill (gnus-article-foldable-buffer (cdar marks))))
(when do-fill
- (fill-region (point-min) (point-max))))
+ (if (not long-lines)
+ (fill-region (point-min) (point-max))
+ (goto-char (point-min))
+ (while (not (eobp))
+ (end-of-line)
+ (when (> (current-column) (frame-width))
+ (save-restriction
+ (narrow-to-region (line-beginning-position) (point))
+ (fill-region (point-min) (point-max))))
+ (forward-line 1)))))
(set-marker (caar marks) nil)
(setq marks (cdr marks)))
(when marks