Synch to Oort Gnus 200303130751.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6568610..bcf8528 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,11 @@
 2003-03-13  Katsumi Yamaoka  <yamaoka@jpl.org>
 
+       * gnus-art.el (gnus-insert-mime-button): Exclude a newline from
+       the button.
+       (gnus-insert-prev-page-button): Ditto.
+       (gnus-insert-next-page-button): Ditto.
+       (gnus-insert-mime-security-button): Ditto.
+
        * mm-view.el (mm-inline-image-emacs): Open the bottom of an image
        one line.  Suggested by Greg Klanderman <gak@klanderman.net>.
        (mm-inline-image-xemacs): Ditto.

diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index 64b3060..b184b90 100644 (file)
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -4651,7 +4651,10 @@ If no internal viewer is available, use an external viewer."
         gnus-part ,gnus-tmp-id
         article-type annotation
         gnus-data ,handle))
-    (setq e (point))
+    (setq e (if (bolp)
+               ;; Exclude a newline.
+               (1- (point))
+             (point)))
     (widget-convert-button
      'link b e
      :mime-handle handle
@@ -6846,7 +6849,10 @@ specified by `gnus-button-alist'."
         article-type annotation
         mime-view-situation ,situation))
     (widget-convert-button
-     'link b (point)
+     'link b (if (bolp)
+                ;; Exclude a newline.
+                (1- (point))
+              (point))
      :action 'gnus-button-prev-page
      :button-keymap gnus-prev-page-map)))
 
@@ -6886,7 +6892,10 @@ specified by `gnus-button-alist'."
                          article-type annotation
                          mime-view-situation ,situation))
     (widget-convert-button
-     'link b (point)
+     'link b (if (bolp)
+                ;; Exclude a newline.
+                (1- (point))
+              (point))
      :action 'gnus-button-next-page
      :button-keymap gnus-next-page-map)))
 
@@ -7246,7 +7255,10 @@ For example:
         gnus-mime-details ,gnus-mime-security-button-pressed
         article-type annotation
         gnus-data ,handle))
-    (setq e (point))
+    (setq e (if (bolp)
+               ;; Exclude a newline.
+               (1- (point))
+             (point)))
     (widget-convert-button
      'link b e
      :mime-handle handle