* gnus-xmas.el (gnus-xmas-define): Make gnus-make-overlay ignore the 4th and

 the 5th arguments.

* gnus-art.el (gnus-insert-mime-button): Always set the 4th argument to
 gnus-make-overlay.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fa88494..02f6e9b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2007-06-05  Katsumi Yamaoka  <yamaoka@jpl.org>
 
+       * gnus-xmas.el (gnus-xmas-define): Make gnus-make-overlay ignore the
+       4th and the 5th arguments.
+
        * gnus-art.el (gnus-insert-mime-button): Make a button overlay without
        the front stickiness.
        (gnus-article-summary-command-nosave): Correct the order of the

diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index eb214f7..0a122e5 100644 (file)
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -5203,10 +5203,8 @@ N is the numerical prefix."
                (1- (point))
              (point)))
     (when gnus-article-button-face
-      (gnus-overlay-put (if (featurep 'xemacs)
-                           (gnus-make-overlay b e)
-                         (gnus-make-overlay b e nil t))
-                        'face gnus-article-button-face))
+      (gnus-overlay-put (gnus-make-overlay b e nil t)
+                       'face gnus-article-button-face))
     (widget-convert-button
      'link b e
      :mime-handle handle

diff --git a/lisp/gnus-xmas.el b/lisp/gnus-xmas.el
index 7e0358c..9a0d9dd 100644 (file)
--- a/lisp/gnus-xmas.el
+++ b/lisp/gnus-xmas.el
@@ -367,7 +367,12 @@ call it with the value of the `gnus-data' text property."
    (t
     (defalias 'gnus-characterp 'characterp)))
 
-  (defalias 'gnus-make-overlay 'make-extent)
+  (defalias 'gnus-make-overlay
+    (lambda (beg end &optional buffer front-advance rear-advance)
+      "Create a new overlay with range BEG to END in BUFFER.
+FRONT-ADVANCE and REAR-ADVANCE are ignored."
+      (make-extent beg end buffer)))
+
   (defalias 'gnus-delete-overlay 'delete-extent)
   (defalias 'gnus-overlay-put 'set-extent-property)
   (defalias 'gnus-move-overlay 'gnus-xmas-move-overlay)