Hotmail changes the format.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 59fe7c7..e6d80d5 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+1999-11-30 09:07:53  Shenghuo ZHU  <zsh@cs.rochester.edu>
+
+       * webmail.el (webmail-hotmail-article): Hotmail changes the
+       format.
+
 1999-11-29  Simon Josefsson  <jas@pdc.kth.se>
 
        * mm-decode.el (mm-display-external): For `copiousoutput' methods,
@@ -904,7 +909,7 @@ Mon Sep 27 15:18:05 1999  Lars Magne Ingebrigtsen  <larsi@menja.ifi.uio.no>
 
        * gnus-art.el (gnus-treat-predicate): Work for (not 5).
 
-1999-08-27  Peter von der Ah\e-A\ ei\ f  <pahe@daimi.au.dk>
+1999-08-27  Peter von der Ah\e-Aé  <pahe@daimi.au.dk>\e$)A
 
        * message.el (message-send): More helpful error message if sending
        fails
@@ -1106,7 +1111,7 @@ Fri Aug 27 13:17:48 1999  Lars Magne Ingebrigtsen  <larsi@menja.ifi.uio.no>
        * gnus-agent.el (gnus-agent-get-undownloaded-list): Don't
        mark cached articles as `undownloaded'.
 
-Tue Jul 20 02:39:56 1999  Peter von der Ah\ ei\ f  <peter@ahe.dk>
+Tue Jul 20 02:39:56 1999  Peter von der Ah\e-Aé  <peter@ahe.dk>\e$)A
 
        * gnus-sum.el (gnus-summary-exit): Allow gnus-use-adaptive-scoring
        to have buffer local values.
@@ -3658,7 +3663,7 @@ Mon Nov 30 23:38:02 1998  Shenghuo ZHU  <zsh@cs.rochester.edu>
 
        * mm-uu.el (mm-uu-dissect): Use mm-make-handle.
 
-1998-12-01 01:53:49  Fran\ eg\ fois Pinard  <pinard@iro.umontreal.ca>
+1998-12-01 01:53:49  Fran\e-Açois Pinard  <pinard@iro.umontreal.ca>\e$)A
 
        * nndoc.el (nndoc-mime-parts-type-p): Do related.
 
@@ -5404,7 +5409,7 @@ Mon Sep 14 18:55:38 1998  Lars Magne Ingebrigtsen  <larsi@menja.ifi.uio.no>
 
        * rfc2047.el (rfc2047-q-encode-region): Would bug out.
 
-1998-09-13  Fran\ eg\ fois Pinard  <pinard@iro.umontreal.ca>
+1998-09-13  Fran\e-Açois Pinard  <pinard@iro.umontreal.ca>\e$)A
 
        * nndoc.el: Make nndoc-dissection-alist simpler for MIME, adjust all
           related functions.  Handle message/rfc822 parts.  Display subject on

diff --git a/lisp/webmail.el b/lisp/webmail.el
index c9dfaef..8fe0fdc 100644 (file)
--- a/lisp/webmail.el
+++ b/lisp/webmail.el
@@ -379,11 +379,11 @@
   (let (p attachment count mime)
     (save-restriction
       (goto-char (point-min))
-      (if (not (search-forward "FILE: wc_pnames.asp -->" nil t))
+      (if (not (search-forward "<DIV>" nil t))
          (error "Can't find start label (article@1)"))
-      (setq p (match-end 0))
-      (search-backward "<table" nil t)
-      (narrow-to-region (point-min) p)
+      (narrow-to-region (point-min) (match-beginning 0))
+      (if (not (search-backward "<table" nil t 2))
+         (error "Can't find start label (article@1.1)"))
       (delete-region (point-min) (match-beginning 0)) 
       (while (search-forward "<a href=" nil t)
        (setq p (match-beginning 0))
@@ -393,6 +393,10 @@
       (webmail-decode-entities)
       (goto-char (point-min))
       (delete-blank-lines)
+      (goto-char (point-min))
+      (when (search-forward "\n\n" nil t)
+       (backward-char)
+       (delete-region (point) (point-max)))
       (goto-char (point-max))
       (widen)
       (insert "\n")