gnus-cite.el (gnus-article-fill-cited-article): Make fill work properly for XEmacs...

gnus-cite.el (gnus-article-fill-cited-article, gnus-article-foldable-buffer, gnus-article-natural-long-line-p): Use window-width rather than frame-width.

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 7dab13825644627b529e63de81c3ecb5538b4077..a5c99c3812955a4f88115a280f50c3916e22ea2a 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,11 @@
+2010-11-02  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * gnus-cite.el (gnus-article-fill-cited-article): Make fill work
+       properly for XEmacs as well.
+       (gnus-article-fill-cited-article, gnus-article-foldable-buffer)
+       (gnus-article-natural-long-line-p): Use window-width rather than
+       frame-width.
+
 2010-11-01  Andrew Cohen  <cohen@andy.bu.edu>
 
        * nnir.el (nnir-run-gmane): inhibit demon. return nil if no messages.

diff --git a/lisp/gnus/gnus-cite.el b/lisp/gnus/gnus-cite.el
index c99cb5cf2e3e5319d28a6abcb4451b2adc7acc53..69d64366de186769ab9f988efe7065ca0a29dca6 100644 (file)
--- a/lisp/gnus/gnus-cite.el
+++ b/lisp/gnus/gnus-cite.el
@@ -544,17 +544,20 @@ longer than the frame width."
                use-hard-newlines)
            (unless do-fill
              (setq do-fill (gnus-article-foldable-buffer (cdar marks))))
+           ;; Note: the XEmacs version of `fill-region' inserts a newline
+           ;; unless the region ends with a newline.
            (when do-fill
              (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))
+                 (when (prog1
+                           (> (current-column) (window-width))
+                         (forward-line 1))
                    (save-restriction
-                     (narrow-to-region (line-beginning-position) (point))
-                     (fill-region (point-min) (point-max))))
-                 (forward-line 1)))))
+                     (narrow-to-region (line-beginning-position 0) (point))
+                     (fill-region (point-min) (point-max))))))))
          (set-marker (caar marks) nil)
          (setq marks (cdr marks)))
        (when marks
@@ -581,7 +584,7 @@ longer than the frame width."
            (push elem columns))
          (setcdr elem (1+ (cdr elem)))))
       (end-of-line)
-      (when (> (current-column) (frame-width))
+      (when (> (current-column) (window-width))
        (setq do-fill t))
       (forward-line 1))
     (and do-fill
@@ -596,7 +599,7 @@ longer than the frame width."
     (and
      ;; The line is long.
      (> (- (line-end-position) (line-beginning-position))
-       (frame-width))
+       (window-width))
      ;; It doesn't start with spaces.
      (not (looking-at "    "))
      ;; Not cited text.