From: yamaoka <yamaoka>
Date: Tue, 11 Jul 2000 03:49:44 +0000 (+0000)
Subject: Synch.
X-Git-Tag: t-gnus-6_14-quimby-before-AC-changed-~2
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d02476eec79375aa05628bd173cff7bd9a6dacdb;p=elisp%2Fgnus.git-

Synch.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1c44cd5..e99aa6f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2000-07-10 22:41:58  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+	* nnslashdot.el (nnslashdot-threaded-retrieve-headers): Save point.
+	* webmail.el (webmail-fetch): Bind 
+	url-http-silence-on-insecure-redirection.
+
 2000-07-10 11:43:22  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
 	* nnslashdot.el (nnslashdot-threaded-retrieve-headers): Use
diff --git a/lisp/nnslashdot.el b/lisp/nnslashdot.el
index 6de3f50..c07e1d8 100644
--- a/lisp/nnslashdot.el
+++ b/lisp/nnslashdot.el
@@ -156,11 +156,14 @@
 	    (forward-line 1)
 	    (if (looking-at
 		 "by <a[^>]+>\\([^<]+\\)</a>[ \t\n]*.*(\\([^)]+\\))")
-		(setq from (concat (nnweb-decode-entities-string (match-string 1))
-				   " <" (match-string 2) ">"))
+		(setq point (match-end 0) 
+		      from (concat 
+			    (nnweb-decode-entities-string (match-string 1))
+			    " <" (match-string 2) ">"))
 	      (looking-at "by \\(.+\\) on ")
-	      (setq from (nnweb-decode-entities-string (match-string 1))))
-	    (goto-char (- (match-end 0) 5))
+	      (setq point (match-end 0) 
+		    from (nnweb-decode-entities-string (match-string 1))))
+	    (goto-char (- point 5))
 	    (search-forward " on ")
 	    (setq date
 		  (nnslashdot-date-to-date
diff --git a/lisp/webmail.el b/lisp/webmail.el
index 5a845c5..1089e2a 100644
--- a/lisp/webmail.el
+++ b/lisp/webmail.el
@@ -278,7 +278,7 @@
       (webmail-fetch-form (car xurl) (webmail-eval (cdr xurl))))
      (t
       (nnweb-insert (apply 'format (webmail-eval xurl)))))))
-  
+
 (defun webmail-init ()
   "Initialize buffers and such."
   (if (gnus-buffer-live-p webmail-buffer)
@@ -337,6 +337,7 @@
 	  (url-confirmation-func (if (memq 'post webmail-paranoid)
 				     'webmail-url-confirmation-func
 				   url-confirmation-func))
+	  (url-http-silence-on-insecure-redirection t)
 	  url-cookie-storage url-cookie-secure-storage
 	  url-cookie-confirmation
 	  item id (n 0))