Synch to Oort Gnus 200303201611.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 96d6b61..ce6a708 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,25 @@
+2003-03-20  Katsumi Yamaoka <yamaoka@jpl.org>
+
+       * message.el (message-make-overlay): Defalias it to make-overlay.
+       (message-delete-overlay): Defalias it to delete-overlay.
+       (message-overlay-put): Defalias it to overlay-put.
+       (message-idna-to-ascii-rhs-1): Use them.
+
+       * messagexmas.el (message-xmas-redefine): Defalias some overlay
+       functions to extent functions.
+
+2003-03-20  Reiner Steib  <Reiner.Steib@gmx.de>
+
+       * message.el (message-check-news-header-syntax): Fixed regexp.
+
+2003-03-20  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * mm-url.el (mm-url-insert): Move url-current-object stuff into
+       mm-url-insert-file-contents.
+
+       * nnrss.el (nnrss-fetch): Fetch the local stuff.
+       (nnrss-check-group): Use it.
+
 2003-03-20 Mark A. Hershberger  <mah@everybody.org> 
 
        * nnrss.el: Primitive XML Name-space support.  This means that RSS

diff --git a/lisp/message.el b/lisp/message.el
index 45141e3..96cca9a 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -4458,7 +4458,7 @@ Otherwise, generate and save a value for `canlock-password' first."
    ;; Check "Shoot me".
    (message-check 'shoot
      (if (re-search-forward
-         "Message-ID.*.i-did-not-set--mail-host-address--so-shoot-me" nil t)
+         "Message-ID.*.i-did-not-set--mail-host-address--so-tickle-me" nil t)
         (y-or-n-p "You appear to have a misconfigured system.  Really post? ")
        t))
    ;; Check for Approved.
@@ -5308,12 +5308,13 @@ I.e., calling it on a Subject: header is useless."
                     (if (eq message-use-idna 'ask)
                         (unwind-protect
                             (progn
-                              (setq ovl (make-overlay startpos endpos))
-                              (overlay-put ovl 'face 'highlight)
+                              (setq ovl (message-make-overlay startpos
+                                                              endpos))
+                              (message-overlay-put ovl 'face 'highlight)
                               (y-or-n-p
                                (format "Replace with `%s'? " ace)))
                           (message "")
-                          (delete-overlay ovl))
+                          (message-delete-overlay ovl))
                       message-use-idna)))
          (replace-match (concat "@" ace)))))))
 
@@ -6852,6 +6853,9 @@ which specify the range to operate on."
            (delete-char -2))))))
 
 (defalias 'message-exchange-point-and-mark 'exchange-point-and-mark)
+(defalias 'message-make-overlay 'make-overlay)
+(defalias 'message-delete-overlay 'delete-overlay)
+(defalias 'message-overlay-put 'overlay-put)
 
 ;; Support for toolbar
 (eval-when-compile

diff --git a/lisp/messagexmas.el b/lisp/messagexmas.el
index 90617a4..d94afa8 100644 (file)
--- a/lisp/messagexmas.el
+++ b/lisp/messagexmas.el
@@ -124,7 +124,10 @@ If it is non-nil, it must be a toolbar.  The five valid values are
     'region-exists-p)
   (when (>= emacs-major-version 20)
     (defalias 'message-make-caesar-translation-table
-      'message-xmas-make-caesar-translation-table)))
+      'message-xmas-make-caesar-translation-table))
+  (defalias 'message-make-overlay 'make-extent)
+  (defalias 'message-delete-overlay 'delete-extent)
+  (defalias 'message-overlay-put 'set-extent-property))
 
 (message-xmas-redefine)
 

diff --git a/lisp/mm-url.el b/lisp/mm-url.el
index 18b1565..aaeb16a 100644 (file)
--- a/lisp/mm-url.el
+++ b/lisp/mm-url.el
@@ -283,14 +283,20 @@ This is taken from RFC 2396.")
          (url-package-name (or mm-url-package-name
                                url-package-name))
          (url-package-version (or mm-url-package-version
-                                  url-package-version)))
-      (prog1
-         (url-insert-file-contents url)
-       (save-excursion
-         (goto-char (point-min))
-         (while (re-search-forward "\r 1000\r ?" nil t)
-           (replace-match "")))
-       (setq buffer-file-name name)))))
+                                  url-package-version))
+         result)
+      (setq result (url-insert-file-contents url))
+      (save-excursion
+       (goto-char (point-min))
+       (while (re-search-forward "\r 1000\r ?" nil t)
+         (replace-match "")))
+      (setq buffer-file-name name)
+      (if (fboundp 'url-generic-parse-url)
+         (setq url-current-object (url-generic-parse-url
+                                   (if (listp result)
+                                       (car result)
+                                     result))))
+      result)))
 
 (defun mm-url-insert-file-contents-external (url)
   (let (program args)
@@ -332,11 +338,6 @@ If FOLLOW-REFRESH is non-nil, redirect refresh url in META."
                  (delete-region (point-min) (point-max))
                  (setq result (mm-url-insert url t)))))
          (setq result (mm-url-insert-file-contents url)))
-       (if (fboundp 'url-generic-parse-url)
-           (setq url-current-object (url-generic-parse-url
-                                     (if (listp result)
-                                         (car result)
-                                       result))))
        (setq done t)))
     result))
 

diff --git a/lisp/nnrss.el b/lisp/nnrss.el
index adb1a8b..12f2918 100644 (file)
--- a/lisp/nnrss.el
+++ b/lisp/nnrss.el
@@ -240,13 +240,16 @@ ARTICLE is the article number of the current headline.")
 
 ;;; Internal functions
 (eval-when-compile (defun xml-rpc-method-call (&rest args)))
-(defun nnrss-fetch (url)
+(defun nnrss-fetch (url &optional local)
   "Fetch the url and put it in a the expected lisp structure."
   (with-temp-buffer
   ;some CVS versions of url.el need this to close the connection quickly
     (let* (xmlform htmlform)
       ;; bit o' work necessary for w3 pre-cvs and post-cvs
-      (mm-url-insert url)
+      (if local
+         (let ((coding-system-for-read 'binary))
+           (insert-file-contents url))
+       (mm-url-insert url))
 
 ;; Because xml-parse-region can't deal with anything that isn't
 ;; xml and w3-parse-buffer can't deal with some xml, we have to
@@ -408,7 +411,7 @@ ARTICLE is the article number of the current headline.")
                                        (nnrss-translate-file-chars
                                         (concat group ".xml"))
                                        nnrss-directory))))
-       (insert-file-contents file)
+       (nnrss-fetch file t)
       (setq url (or (nth 2 (assoc group nnrss-server-data))
                    (second (assoc group nnrss-group-alist))))
       (unless url