Synch to Oort Gnus 200303201128.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0a9528d..190fffa 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2003-03-20  Katsumi Yamaoka <yamaoka@jpl.org>
+
+       * message.el (message-idna-to-ascii-rhs-1): Don't use replace-*
+       for highlight overlays.
+
 2003-03-20  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * gnus-cache.el (gnus-cache-braid-nov): Test if a line looks like

diff --git a/lisp/message.el b/lisp/message.el
index 2009338..45141e3 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -5291,7 +5291,7 @@ I.e., calling it on a Subject: header is useless."
 
 (defun message-idna-to-ascii-rhs-1 (header)
   "Interactively potentially IDNA encode domain names in HEADER."
-  (let (rhs ace start end startpos endpos)
+  (let (rhs ace start end startpos endpos ovl)
     (goto-char (point-min))
     (setq start (re-search-forward (concat "^" header) nil t)
          end (or (save-excursion (re-search-forward "^[ \t]" nil t))
@@ -5308,11 +5308,12 @@ I.e., calling it on a Subject: header is useless."
                     (if (eq message-use-idna 'ask)
                         (unwind-protect
                             (progn
-                              (replace-highlight startpos endpos)
+                              (setq ovl (make-overlay startpos endpos))
+                              (overlay-put ovl 'face 'highlight)
                               (y-or-n-p
                                (format "Replace with `%s'? " ace)))
                           (message "")
-                          (replace-dehighlight))
+                          (delete-overlay ovl))
                       message-use-idna)))
          (replace-match (concat "@" ace)))))))