changeset 110062:18cbc8672753

Merge from mainline.
author Katsumi Yamaoka <yamaoka@jpl.org>
date Tue, 31 Aug 2010 00:03:58 +0000
parents b16d23b49c5e (current diff) a53fffd298ac (diff)
children 588307a027eb
files lisp/gnus/nnslashdot.el
diffstat 14 files changed, 53 insertions(+), 625 deletions(-) [+]
line wrap: on
line diff
--- a/doc/misc/gnus.texi	Mon Aug 30 22:42:25 2010 +0000
+++ b/doc/misc/gnus.texi	Tue Aug 31 00:03:58 2010 +0000
@@ -695,7 +695,6 @@
 
 * Archiving Mail::
 * Web Searches::                Creating groups from articles that match a string.
-* Slashdot::                    Reading the Slashdot comments.
 * Ultimate::                    The Ultimate Bulletin Board systems.
 * Web Archive::                 Reading mailing list archived on web.
 * RSS::                         Reading RDF site summary.
@@ -1295,7 +1294,7 @@
 topic parameter that looks like
 
 @example
-"nnslashdot"
+"nnml"
 @end example
 
 will mean that all groups that match that regex will be subscribed under
@@ -17417,7 +17416,6 @@
 @menu
 * Archiving Mail::
 * Web Searches::                Creating groups from articles that match a string.
-* Slashdot::                    Reading the Slashdot comments.
 * Ultimate::                    The Ultimate Bulletin Board systems.
 * Web Archive::                 Reading mailing list archived on web.
 * RSS::                         Reading RDF site summary.
@@ -17562,94 +17560,6 @@
 @end table
 
 
-@node Slashdot
-@subsection Slashdot
-@cindex Slashdot
-@cindex nnslashdot
-
-@uref{http://slashdot.org/, Slashdot} is a popular news site, with
-lively discussion following the news articles.  @code{nnslashdot} will
-let you read this forum in a convenient manner.
-
-The easiest way to read this source is to put something like the
-following in your @file{~/.gnus.el} file:
-
-@lisp
-(setq gnus-secondary-select-methods
-      '((nnslashdot "")))
-@end lisp
-
-This will make Gnus query the @code{nnslashdot} back end for new comments
-and groups.  The @kbd{F} command will subscribe each new news article as
-a new Gnus group, and you can read the comments by entering these
-groups.  (Note that the default subscription method is to subscribe new
-groups as zombies.  Other methods are available (@pxref{Subscription
-Methods}).
-
-If you want to remove an old @code{nnslashdot} group, the @kbd{G DEL}
-command is the most handy tool (@pxref{Foreign Groups}).
-
-When following up to @code{nnslashdot} comments (or posting new
-comments), some light @acronym{HTML}izations will be performed.  In
-particular, text quoted with @samp{> } will be quoted with
-@samp{blockquote} instead, and signatures will have @samp{br} added to
-the end of each line.  Other than that, you can just write @acronym{HTML}
-directly into the message buffer.  Note that Slashdot filters out some
-@acronym{HTML} forms.
-
-The following variables can be altered to change its behavior:
-
-@table @code
-@item nnslashdot-threaded
-Whether @code{nnslashdot} should display threaded groups or not.  The
-default is @code{t}.  To be able to display threads, @code{nnslashdot}
-has to retrieve absolutely all comments in a group upon entry.  If a
-threaded display is not required, @code{nnslashdot} will only retrieve
-the comments that are actually wanted by the user.  Threading is nicer,
-but much, much slower than unthreaded.
-
-@item nnslashdot-login-name
-@vindex nnslashdot-login-name
-The login name to use when posting.
-
-@item nnslashdot-password
-@vindex nnslashdot-password
-The password to use when posting.
-
-@item nnslashdot-directory
-@vindex nnslashdot-directory
-Where @code{nnslashdot} will store its files.  The default is
-@file{~/News/slashdot/}.
-
-@item nnslashdot-active-url
-@vindex nnslashdot-active-url
-The @acronym{URL} format string that will be used to fetch the
-information on news articles and comments.  The default is@*
-@samp{http://slashdot.org/search.pl?section=&min=%d}.
-
-@item nnslashdot-comments-url
-@vindex nnslashdot-comments-url
-The @acronym{URL} format string that will be used to fetch comments.
-
-@item nnslashdot-article-url
-@vindex nnslashdot-article-url
-The @acronym{URL} format string that will be used to fetch the news
-article.  The default is
-@samp{http://slashdot.org/article.pl?sid=%s&mode=nocomment}.
-
-@item nnslashdot-threshold
-@vindex nnslashdot-threshold
-The score threshold.  The default is -1.
-
-@item nnslashdot-group-number
-@vindex nnslashdot-group-number
-The number of old groups, in addition to the ten latest, to keep
-updated.  The default is 0.
-
-@end table
-
-
-
 @node Ultimate
 @subsection Ultimate
 @cindex nnultimate
@@ -29591,7 +29501,7 @@
 @code{nnml-nov-is-evil}, @code{nnspool-nov-is-evil}, and
 @code{nnwarchive-nov-is-evil}.  Note that a non-@code{nil} value for
 @code{gnus-nov-is-evil} overrides all those variables.@footnote{Although
-the back ends @code{nnkiboze}, @code{nnslashdot}, @code{nnultimate}, and
+the back ends @code{nnkiboze}, @code{nnultimate}, and
 @code{nnwfm} don't have their own nn*-nov-is-evil.}
 @end table
 
--- a/lisp/gnus/ChangeLog	Mon Aug 30 22:42:25 2010 +0000
+++ b/lisp/gnus/ChangeLog	Tue Aug 31 00:03:58 2010 +0000
@@ -1,3 +1,25 @@
+2010-08-30  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+	* nnslashdot.el: Removed this unused backend.
+
+	* gnus-undo.el (gnus-undo-register-1): Limit the undo actions to 100
+	actions.
+	(gnus-undo-register-1): Revert last change.
+
+	* gnus-group.el (gnus-group-completing-read): Protect against not
+	having completion-styles bound.
+
+	* mml.el (mml-insert-mime-headers-always): Change the default to t, to
+	make broken recipients happier.
+
+	* gnus-html.el (gnus-html-put-image): Use gnus-put-image.
+
+	* gnus-ems.el (gnus-put-image): Have gnus-put-image take an optional
+	point parameter.
+
+	* gnus-group.el (gnus-group-completing-read): Add 'substring to
+	completion-styles for group selection.
+
 2009-02-04  Andreas Schwab  <schwab@suse.de>
 
 	* gnus-score.el (gnus-score-string): Fix regex for matching extra
--- a/lisp/gnus/gnus-ems.el	Mon Aug 30 22:42:25 2010 +0000
+++ b/lisp/gnus/gnus-ems.el	Tue Aug 31 00:03:58 2010 +0000
@@ -274,13 +274,15 @@
       (setq props (plist-put props :background (face-background face))))
     (apply 'create-image file type data-p props)))
 
-(defun gnus-put-image (glyph &optional string category)
-  (let ((point (point)))
-    (insert-image glyph (or string " "))
-    (put-text-property point (point) 'gnus-image-category category)
-    (unless string
-      (put-text-property (1- (point)) (point)
-			 'gnus-image-text-deletable t))
+(defun gnus-put-image (glyph &optional string category point)
+  (let ((point (or point (point))))
+    (save-excursion
+      (goto-char point)
+      (insert-image glyph (or string " "))
+      (put-text-property point (point) 'gnus-image-category category)
+      (unless string
+	(put-text-property (1- (point)) (point)
+			   'gnus-image-text-deletable t)))
     glyph))
 
 (defun gnus-remove-image (image &optional category)
--- a/lisp/gnus/gnus-group.el	Mon Aug 30 22:42:25 2010 +0000
+++ b/lisp/gnus/gnus-group.el	Tue Aug 31 00:03:58 2010 +0000
@@ -2202,7 +2202,10 @@
 The arguments are the same as `completing-read' except that COLLECTION
 and HIST default to `gnus-active-hashtb' and `gnus-group-history'
 respectively if they are omitted."
-  (let (group)
+  (let ((completion-styles (and (boundp 'completion-styles)
+				completion-styles))
+	group)
+    (push 'substring completion-styles)
     (mapatoms (lambda (symbol)
 		(setq group (symbol-name symbol))
 		(set (intern (if (string-match "[^\000-\177]" group)
--- a/lisp/gnus/gnus-html.el	Mon Aug 30 22:42:25 2010 +0000
+++ b/lisp/gnus/gnus-html.el	Tue Aug 31 00:03:58 2010 +0000
@@ -157,7 +157,7 @@
 	  (set-buffer buffer)
 	  (let ((buffer-read-only nil))
 	    (when (gnus-html-put-image file (cadr spec))
-	      (delete-region (cadr spec) (caddr spec))))))
+	      (delete-region (1+ (cadr spec)) (caddr spec))))))
       (when images
 	(gnus-html-schedule-image-fetching buffer images)))))
 
@@ -171,11 +171,11 @@
 		       (= (car (image-size image t)) 30)
 		       (= (cdr (image-size image t)) 30))))
 	(progn
-	  (put-image image point)
+	  (gnus-put-image image nil nil point)
 	  t)
       (when (fboundp 'find-image)
-	(put-image (find-image '((:type xpm :file "lock-broken.xpm")))
-		   point))
+	(gnus-put-image (find-image '((:type xpm :file "lock-broken.xpm")))
+			nil nil point))
       nil)))
 
 (defun gnus-html-prune-cache ()
--- a/lisp/gnus/gnus.el	Mon Aug 30 22:42:25 2010 +0000
+++ b/lisp/gnus/gnus.el	Tue Aug 31 00:03:58 2010 +0000
@@ -1746,7 +1746,6 @@
     ("nnfolder" mail respool address)
     ("nngateway" post-mail address prompt-address physical-address)
     ("nnweb" none)
-    ("nnslashdot" post)
     ("nnultimate" none)
     ("nnrss" none)
     ("nnwfm" none)
--- a/lisp/gnus/mailcap.el	Mon Aug 30 22:42:25 2010 +0000
+++ b/lisp/gnus/mailcap.el	Tue Aug 31 00:03:58 2010 +0000
@@ -335,7 +335,7 @@
   :group 'mailcap)
 
 (defvar mailcap-poor-system-types
-  '(ms-dos ms-windows windows-nt win32 w32 mswindows)
+  '(ms-dos windows-nt)
   "Systems that don't have a Unix-like directory hierarchy.")
 
 ;;;
--- a/lisp/gnus/message.el	Mon Aug 30 22:42:25 2010 +0000
+++ b/lisp/gnus/message.el	Tue Aug 31 00:03:58 2010 +0000
@@ -5433,7 +5433,7 @@
 	   (* 25 25)))
   (let ((tm (current-time)))
     (concat
-     (if (or (memq system-type '(ms-dos emx))
+     (if (or (eq system-type 'ms-dos)
 	     ;; message-number-base36 doesn't handle bigints.
 	     (floatp (user-uid)))
 	 (let ((user (downcase (user-login-name))))
@@ -6451,9 +6451,7 @@
       (setq buffer-file-name (expand-file-name
 			      (concat
 			      (if (memq system-type
-					'(ms-dos ms-windows windows-nt
-						 cygwin cygwin32 win32 w32
-						 mswindows))
+					'(ms-dos windows-nt cygwin))
 				  "message"
 				"*message*")
 			       (format-time-string "-%Y%m%d-%H%M%S"))
--- a/lisp/gnus/mm-util.el	Mon Aug 30 22:42:25 2010 +0000
+++ b/lisp/gnus/mm-util.el	Tue Aug 31 00:03:58 2010 +0000
@@ -680,7 +680,7 @@
   "100% binary coding system.")
 
 (defvar mm-text-coding-system
-  (or (if (memq system-type '(windows-nt ms-dos ms-windows))
+  (or (if (memq system-type '(windows-nt ms-dos))
 	  (and (mm-coding-system-p 'raw-text-dos) 'raw-text-dos)
 	(and (mm-coding-system-p 'raw-text) 'raw-text))
       mm-binary-coding-system)
@@ -692,12 +692,12 @@
 (defvar mm-auto-save-coding-system
   (cond
    ((mm-coding-system-p 'utf-8-emacs)	; Mule 7
-    (if (memq system-type '(windows-nt ms-dos ms-windows))
+    (if (memq system-type '(windows-nt ms-dos))
 	(if (mm-coding-system-p 'utf-8-emacs-dos)
 	    'utf-8-emacs-dos mm-binary-coding-system)
       'utf-8-emacs))
    ((mm-coding-system-p 'emacs-mule)
-    (if (memq system-type '(windows-nt ms-dos ms-windows))
+    (if (memq system-type '(windows-nt ms-dos))
 	(if (mm-coding-system-p 'emacs-mule-dos)
 	    'emacs-mule-dos mm-binary-coding-system)
       'emacs-mule))
--- a/lisp/gnus/nnheader.el	Mon Aug 30 22:42:25 2010 +0000
+++ b/lisp/gnus/nnheader.el	Tue Aug 31 00:03:58 2010 +0000
@@ -77,7 +77,7 @@
   "*Length of each read operation when trying to fetch HEAD headers.")
 
 (defvar nnheader-read-timeout
-  (if (string-match "windows-nt\\|os/2\\|emx\\|cygwin"
+  (if (string-match "windows-nt\\|os/2\\|cygwin"
 		    (symbol-name system-type))
       ;; http://thread.gmane.org/v9655t3pjo.fsf@marauder.physik.uni-ulm.de
       ;;
@@ -102,7 +102,7 @@
 (defvar nnheader-file-name-translation-alist
   (let ((case-fold-search t))
     (cond
-     ((string-match "windows-nt\\|os/2\\|emx\\|cygwin"
+     ((string-match "windows-nt\\|os/2\\|cygwin"
 		    (symbol-name system-type))
       (append (mapcar (lambda (c) (cons c ?_))
 		      '(?: ?* ?\" ?< ?> ??))
@@ -786,8 +786,7 @@
 	;; We translate -- but only the file name.  We leave the directory
 	;; alone.
 	(if (and (featurep 'xemacs)
-		 (memq system-type '(cygwin32 win32 w32 mswindows windows-nt
-					      cygwin)))
+		 (memq system-type '(windows-nt cygwin)))
 	    ;; This is needed on NT and stuff, because
 	    ;; file-name-nondirectory is not enough to split
 	    ;; file names, containing ':', e.g.
--- a/lisp/gnus/nnmail.el	Mon Aug 30 22:42:25 2010 +0000
+++ b/lisp/gnus/nnmail.el	Tue Aug 31 00:03:58 2010 +0000
@@ -265,7 +265,7 @@
   :type 'function)
 
 (defcustom nnmail-crosspost-link-function
-  (if (string-match "windows-nt\\|emx" (symbol-name system-type))
+  (if (string-match "windows-nt" (symbol-name system-type))
       'copy-file
     'add-name-to-file)
   "*Function called to create a copy of a file.
--- a/lisp/gnus/nnslashdot.el	Mon Aug 30 22:42:25 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,505 +0,0 @@
-;;; nnslashdot.el --- interfacing with Slashdot
-
-;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-
-;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
-;; Keywords: news
-
-;; This file is part of GNU Emacs.
-
-;; GNU Emacs is free software: you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; GNU Emacs is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;;; Code:
-
-(eval-when-compile (require 'cl))
-
-(require 'nnoo)
-(require 'message)
-(require 'gnus-util)
-(require 'gnus)
-(require 'nnmail)
-(require 'mm-util)
-(require 'mm-url)
-
-(nnoo-declare nnslashdot)
-
-(defvoo nnslashdot-directory (nnheader-concat gnus-directory "slashdot/")
-  "Where nnslashdot will save its files.")
-
-(defvoo nnslashdot-active-url "http://slashdot.org/search.pl?section=&min=%d"
-  "Where nnslashdot will fetch the active file from.")
-
-(defvoo nnslashdot-comments-url "http://slashdot.org/comments.pl?sid=%s&threshold=%d&commentsort=%d&mode=flat&startat=%d"
-  "Where nnslashdot will fetch comments from.")
-
-(defvoo nnslashdot-article-url
-    "http://slashdot.org/article.pl?sid=%s&mode=nocomment"
-  "Where nnslashdot will fetch the article from.")
-
-(defvoo nnslashdot-backslash-url "http://slashdot.org/slashdot.xml"
-  "Where nnslashdot will fetch the stories from.")
-
-(defvoo nnslashdot-use-front-page nil
-  "Use the front page in addition to the backslash page.")
-
-(defvoo nnslashdot-threshold -1
-  "The article threshold.")
-
-(defvoo nnslashdot-threaded t
-  "Whether the nnslashdot groups should be threaded or not.")
-
-(defvoo nnslashdot-group-number 0
-  "The number of non-fresh groups to keep updated.")
-
-(defvoo nnslashdot-login-name ""
-  "The login name to use when posting.")
-
-(defvoo nnslashdot-password ""
-  "The password to use when posting.")
-
-;;; Internal variables
-
-(defvar nnslashdot-groups nil)
-(defvar nnslashdot-buffer nil)
-(defvar nnslashdot-headers nil)
-
-;;; Interface functions
-
-(nnoo-define-basics nnslashdot)
-
-(deffoo nnslashdot-retrieve-headers (articles &optional group server fetch-old)
-  (nnslashdot-possibly-change-server group server)
-  (condition-case why
-      (unless gnus-nov-is-evil
- 	(nnslashdot-retrieve-headers-1 articles group))
-    (search-failed (nnslashdot-lose why))))
-
-(deffoo nnslashdot-retrieve-headers-1 (articles group)
-  (let* ((last (car (last articles)))
-	 (start (if nnslashdot-threaded 1 (pop articles)))
-	 (entry (assoc group nnslashdot-groups))
-	 (sid (nth 2 entry))
-	 (first-comments t)
-	 headers article subject score from date lines parent point cid
-	 s startats changed)
-    (save-excursion
-      (set-buffer nnslashdot-buffer)
-      (let ((case-fold-search t))
-	(erase-buffer)
-	(when (= start 1)
-	  (mm-url-insert (format nnslashdot-article-url sid) t)
-	  (goto-char (point-min))
-	  (if (eobp)
-	      (error "Couldn't open connection to slashdot"))
-	  (re-search-forward "Posted by[ \t\r\n]+")
-	  (when (looking-at "\\(<a[^>]+>\\)?[ \t\r\n]*\\([^<\r\n]+\\)")
-	    (setq from (mm-url-decode-entities-string (match-string 2))))
-	  (search-forward "on ")
-	  (setq date (nnslashdot-date-to-date
-		      (buffer-substring (point) (1- (search-forward "<")))))
-	  (setq lines (/ (- (point)
-			    (progn (forward-line 1) (point)))
-			 60))
-	  (push
-	   (cons
-	    1
-	    (make-full-mail-header
-	     1 group from date
-	     (concat "<" sid "%1@slashdot>")
-	     "" 0 lines nil nil))
-	   headers)
-	  (setq start (if nnslashdot-threaded 2 (pop articles))))
-	(while (and start (<= start last))
-	  (setq point (goto-char (point-max)))
-	  (mm-url-insert
-	   (format nnslashdot-comments-url sid
-		   nnslashdot-threshold 0 (- start 2))
-	   t)
-	  (when (and nnslashdot-threaded first-comments)
-	    (setq first-comments nil)
-	    (goto-char (point-max))
-	    (while (re-search-backward "startat=\\([0-9]+\\)" nil t)
-	      (setq s (string-to-number (match-string 1)))
-	      (unless (memq s startats)
-		(push s startats)))
-	    (setq startats (sort startats '<)))
-	  (setq article (if (and article (< start article)) article start))
-	  (goto-char point)
-	  (while (re-search-forward
-		  "<a name=\"\\([0-9]+\\)\">\\([^<]+\\)\\(?:.*\n\\)\\{2,10\\}.*score:\\([^)]+\\))"
-		  nil t)
-	    (setq cid (match-string 1)
-		  subject (match-string 2)
-		  score (match-string 3))
-	    (unless (assq article (nth 4 entry))
-	      (setcar (nthcdr 4 entry) (cons (cons article cid) (nth 4 entry)))
-	      (setq changed t))
-	    (when (string-match "^Re: *" subject)
-	      (setq subject (concat "Re: " (substring subject (match-end 0)))))
-	    (setq subject (mm-url-decode-entities-string subject)
-		  from "")
-	    (when (re-search-forward "by[ \t\n]+<[^>]+>\\([^<(]+\\)" nil t)
-	      (setq from
-		    (concat
-		     (mm-url-decode-entities-string (match-string 1))
-		     " <nobody@slashdot.org>")))
-	    (search-forward "on ")
-	    (setq date
-		  (nnslashdot-date-to-date
-		   (buffer-substring
-		    (point) (progn (skip-chars-forward "^()<>\n\r") (point)))))
-	    (setq lines (/ (abs (- (search-forward "<div")
-				   (search-forward "</div>")))
-			   70))
-	    (if (not
-		 (re-search-forward ".*cid=\\([0-9]+\\)\">Parent</A>" nil t))
-		(setq parent nil)
-	      (setq parent (match-string 1))
-	      (when (string= parent "0")
-		(setq parent nil)))
-	    (push
-	     (cons
-	      article
-	      (make-full-mail-header
-	       article
-	       (concat subject " (" score ")")
-	       from date
-	       (concat "<" sid "%" cid "@slashdot>")
-	       (if parent
-		   (concat "<" sid "%" parent "@slashdot>")
-		 "")
-	       0 lines nil nil))
-	     headers)
-	    (while (and articles (<= (car articles) article))
-	      (pop articles))
-	    (setq article (1+ article)))
-	  (if nnslashdot-threaded
-	      (progn
-		(setq start (pop startats))
-		(if start (setq start (+ start 2))))
-	    (setq start (pop articles))))))
-    (if changed (nnslashdot-write-groups))
-    (setq nnslashdot-headers (sort headers 'car-less-than-car))
-    (save-excursion
-      (set-buffer nntp-server-buffer)
-      (erase-buffer)
-      (mm-with-unibyte-current-buffer
-       (dolist (header nnslashdot-headers)
-	 (nnheader-insert-nov (cdr header)))))
-    'nov))
-
-(deffoo nnslashdot-request-group (group &optional server dont-check)
-  (nnslashdot-possibly-change-server nil server)
-  (let ((elem (assoc group nnslashdot-groups)))
-    (cond
-     ((not elem)
-      (nnheader-report 'nnslashdot "Group does not exist"))
-     (t
-      (nnheader-report 'nnslashdot "Opened group %s" group)
-      (nnheader-insert
-       "211 %d %d %d %s\n" (cadr elem) 1 (cadr elem)
-       (prin1-to-string group))))))
-
-(deffoo nnslashdot-close-group (group &optional server)
-  (nnslashdot-possibly-change-server group server)
-  (when (gnus-buffer-live-p nnslashdot-buffer)
-    (save-excursion
-      (set-buffer nnslashdot-buffer)
-      (kill-buffer nnslashdot-buffer)))
-  t)
-
-(deffoo nnslashdot-request-article (article &optional group server buffer)
-  (nnslashdot-possibly-change-server group server)
-  (let (contents cid)
-    (condition-case why
-	(save-excursion
-	  (set-buffer nnslashdot-buffer)
-	  (let ((case-fold-search t))
-	    (goto-char (point-min))
-	    (when (and (stringp article)
-		       (string-match "%\\([0-9]+\\)@" article))
-	      (setq cid (match-string 1 article))
-	      (let ((map (nth 4 (assoc group nnslashdot-groups))))
-		(while map
-		  (if (equal (cdar map) cid)
-		      (setq article (caar map)
-			    map nil)
-		    (setq map (cdr map))))))
-	    (when (numberp article)
-	      (if (= article 1)
-		  (progn
-		    (search-forward "Posted by")
-		    (search-forward "<div class=\"intro\">")
-		    (setq contents
-			  (buffer-substring
-			   (point)
-			   (progn
-			     (search-forward "commentwrap")
-			     (match-beginning 0)))))
-		(setq cid (cdr (assq article
-				     (nth 4 (assoc group nnslashdot-groups)))))
-		(search-forward (format "<a name=\"%s\">" cid))
-		(setq contents
-		      (buffer-substring
-		       (search-forward "<div class=\"commentBody\">")
-		       (progn
-			 (search-forward "<div class=\"commentSub\"")
-			 (match-beginning 0))))))))
-      (search-failed (nnslashdot-lose why)))
-
-    (when contents
-      (save-excursion
-	(set-buffer (or buffer nntp-server-buffer))
-	(erase-buffer)
-	(mm-with-unibyte-current-buffer
-	  (insert contents)
-	  (goto-char (point-min))
-	  (while (re-search-forward "\\(<br>\r?\\)+" nil t)
-	    (replace-match "<p>" t t))
-	  (goto-char (point-min))
-	  (insert "Content-Type: text/html\nMIME-Version: 1.0\n")
-	  (insert "Newsgroups: " (caddr (assoc group nnslashdot-groups))
-		  "\n")
-	  (let ((header (cdr (assq article nnslashdot-headers))))
-	    (nnheader-insert-header header))
-	  (nnheader-report 'nnslashdot "Fetched article %s" article))
-	(cons group article)))))
-
-(deffoo nnslashdot-close-server (&optional server)
-  (when (and (nnslashdot-server-opened server)
-	     (gnus-buffer-live-p nnslashdot-buffer))
-    (save-excursion
-      (set-buffer nnslashdot-buffer)
-      (kill-buffer nnslashdot-buffer)))
-  (nnoo-close-server 'nnslashdot server))
-
-(deffoo nnslashdot-request-list (&optional server)
-  (nnslashdot-possibly-change-server nil server)
-  (let ((number 0)
-	(first nnslashdot-use-front-page)
-	sid elem description articles gname)
-    (condition-case why
-	;; First we do the Ultramode to get info on all the latest groups.
-	(progn
-	  (mm-with-unibyte-buffer
-	    (mm-url-insert nnslashdot-backslash-url t)
-	    (goto-char (point-min))
-	    (if (eobp)
-		(error "Couldn't open connection to slashdot"))
-	    (while (search-forward "<story>" nil t)
-	      (narrow-to-region (point) (search-forward "</story>"))
-	      (goto-char (point-min))
-	      (re-search-forward "<title>\\([^<]+\\)</title>")
-	      (setq description
-		    (mm-url-decode-entities-string (match-string 1)))
-	      (re-search-forward "<url>\\([^<]+\\)</url>")
-	      (setq sid (match-string 1))
-	      (string-match "sid=\\([0-9/]+\\)\\(.shtml\\|$\\)" sid)
-	      (setq sid (match-string 1 sid))
-	      (re-search-forward "<comments>\\([^<]+\\)</comments>")
-	      (setq articles (string-to-number (match-string 1)))
-	      (setq gname (concat description " (" sid ")"))
-	      (if (setq elem (assoc gname nnslashdot-groups))
-		  (setcar (cdr elem) articles)
-		(push (list gname articles sid (current-time) nil)
-		      nnslashdot-groups))
-	      (goto-char (point-max))
-	      (widen)))
-	  ;; Then do the older groups.
-	  (while (or first
-		     (> (- nnslashdot-group-number number) 0))
-  	    (setq first nil)
-	    (mm-with-unibyte-buffer
-	      (let ((case-fold-search t))
-		(mm-url-insert (format nnslashdot-active-url number) t)
-		(goto-char (point-min))
-		(while (re-search-forward
-			"article.pl\\?sid=\\([^&]+\\).*>\\([^<]+\\)</a>"
-			nil t)
-		  (setq sid (match-string 1)
-			description
-			(mm-url-decode-entities-string (match-string 2)))
-		  (forward-line 1)
-		  (when (re-search-forward "with \\([0-9]+\\) comment" nil t)
-		    (setq articles (1+ (string-to-number (match-string 1)))))
-		  (setq gname (concat description " (" sid ")"))
-		  (if (setq elem (assoc gname nnslashdot-groups))
-		      (setcar (cdr elem) articles)
-		    (push (list gname articles sid (current-time) nil)
-			  nnslashdot-groups)))))
-	    (incf number 30)))
-      (search-failed (nnslashdot-lose why)))
-    (nnslashdot-write-groups)
-    (nnslashdot-generate-active)
-    t))
-
-(deffoo nnslashdot-request-newgroups (date &optional server)
-  (nnslashdot-possibly-change-server nil server)
-  (nnslashdot-generate-active)
-  t)
-
-(deffoo nnslashdot-request-post (&optional server)
-  (nnslashdot-possibly-change-server nil server)
-  (let ((sid (message-fetch-field "newsgroups"))
-	(subject (message-fetch-field "subject"))
-	(references (car (last (split-string
-				(message-fetch-field "references")))))
-	body quoted pid)
-    (string-match "%\\([0-9]+\\)@slashdot" references)
-    (setq pid (match-string 1 references))
-    (message-goto-body)
-    (narrow-to-region (point) (progn (message-goto-signature) (point)))
-    (goto-char (point-min))
-    (while (not (eobp))
-      (if (looking-at "> ")
-	  (progn
-	    (delete-region (point) (+ (point) 2))
-	    (unless quoted
-	      (insert "<blockquote>\n"))
-	    (setq quoted t))
-	(when quoted
-	  (insert "</blockquote>\n")
-	  (setq quoted nil)))
-      (forward-line 1))
-    (goto-char (point-min))
-    (while (re-search-forward "^ *\n" nil t)
-      (replace-match "<p>\n"))
-    (widen)
-    (when (message-goto-signature)
-      (forward-line -1)
-      (insert "<p>\n")
-      (while (not (eobp))
-	(end-of-line)
-	(insert "<br>")
-	(forward-line 1)))
-    (message-goto-body)
-    (setq body (buffer-substring (point) (point-max)))
-    (erase-buffer)
-    (mm-url-fetch-form
-     "http://slashdot.org/comments.pl"
-     `(("sid" . ,sid)
-       ("pid" . ,pid)
-       ("rlogin" . "userlogin")
-       ("unickname" . ,nnslashdot-login-name)
-       ("upasswd" . ,nnslashdot-password)
-       ("postersubj" . ,subject)
-       ("op" . "Submit")
-       ("postercomment" . ,body)
-       ("posttype" . "html")))))
-
-(deffoo nnslashdot-request-delete-group (group &optional force server)
-  (nnslashdot-possibly-change-server group server)
-  (setq nnslashdot-groups (delq (assoc group nnslashdot-groups)
-				nnslashdot-groups))
-  (nnslashdot-write-groups))
-
-(deffoo nnslashdot-request-close ()
-  (setq nnslashdot-headers nil
-	nnslashdot-groups nil))
-
-(deffoo nnslashdot-request-expire-articles
-    (articles group &optional server force)
-  (nnslashdot-possibly-change-server group server)
-  (let ((item (assoc group nnslashdot-groups)))
-    (when item
-      (if (fourth item)
-	  (when (and (>= (length articles) (cadr item)) ;; All are expirable.
-		     (nnmail-expired-article-p
-		      group
-		      (fourth item)
-		      force))
-	    (setq nnslashdot-groups (delq item nnslashdot-groups))
-	    (nnslashdot-write-groups)
-	    (setq articles nil)) ;; all expired.
-	(setcdr (cddr item) (list (current-time)))
-	(nnslashdot-write-groups))))
-  articles)
-
-(nnoo-define-skeleton nnslashdot)
-
-;;; Internal functions
-
-(defun nnslashdot-possibly-change-server (&optional group server)
-  (nnslashdot-init server)
-  (when (and server
-	     (not (nnslashdot-server-opened server)))
-    (nnslashdot-open-server server))
-  (unless nnslashdot-groups
-    (nnslashdot-read-groups)))
-
-(defun nnslashdot-make-tuple (tuple n)
-  (prog1
-      tuple
-    (while (> n 1)
-      (unless (cdr tuple)
-	(setcdr tuple (list nil)))
-      (setq tuple (cdr tuple)
-	    n (1- n)))))
-
-(defun nnslashdot-read-groups ()
-  (let ((file (expand-file-name "groups" nnslashdot-directory)))
-    (when (file-exists-p file)
-      (mm-with-unibyte-buffer
-	(insert-file-contents file)
-	(goto-char (point-min))
-	(setq nnslashdot-groups (read (current-buffer))))
-      (when (and nnslashdot-groups (< (length (car nnslashdot-groups)) 5))
-	(dolist (group nnslashdot-groups)
-	  (nnslashdot-make-tuple group 5))))))
-
-(defun nnslashdot-write-groups ()
-  (with-temp-file (expand-file-name "groups" nnslashdot-directory)
-    (gnus-prin1 nnslashdot-groups)))
-
-(defun nnslashdot-init (server)
-  "Initialize buffers and such."
-  (unless (file-exists-p nnslashdot-directory)
-    (gnus-make-directory nnslashdot-directory))
-  (unless (gnus-buffer-live-p nnslashdot-buffer)
-    (setq nnslashdot-buffer
-	  (save-excursion
-	    (nnheader-set-temp-buffer
-	     (format " *nnslashdot %s*" server))))
-    (push nnslashdot-buffer gnus-buffers)))
-
-(defun nnslashdot-date-to-date (sdate)
-  (condition-case err
-      (let ((elem (delete "" (split-string sdate))))
-	(concat (substring (nth 0 elem) 0 3) " "
-		(substring (nth 1 elem) 0 3) " "
-		(substring (nth 2 elem) 0 2) " "
-		(substring (nth 3 elem) 1 6) " "
-		(format-time-string "%Y") " "
-		(nth 4 elem)))
-    (error "")))
-
-(defun nnslashdot-generate-active ()
-  (save-excursion
-    (set-buffer nntp-server-buffer)
-    (erase-buffer)
-    (dolist (elem nnslashdot-groups)
-      (when (numberp (cadr elem))
-	(insert (prin1-to-string (car elem))
-		" " (number-to-string (cadr elem)) " 1 y\n")))))
-
-(defun nnslashdot-lose (why)
-  (error "Slashdot HTML has changed; please get a new version of nnslashdot"))
-
-(provide 'nnslashdot)
-
-;; arch-tag: aa73df7a-f7e6-4eef-bdea-5ce2f8c691b3
-;;; nnslashdot.el ends here
--- a/lisp/gnus/pop3.el	Mon Aug 30 22:42:25 2010 +0000
+++ b/lisp/gnus/pop3.el	Tue Aug 31 00:03:58 2010 +0000
@@ -120,7 +120,7 @@
       (defalias 'pop3-accept-process-output 'nnheader-accept-process-output)
     ;; Borrowed from `nnheader.el':
     (defvar pop3-read-timeout
-      (if (string-match "windows-nt\\|os/2\\|emx\\|cygwin"
+      (if (string-match "windows-nt\\|os/2\\|cygwin"
 			(symbol-name system-type))
 	  1.0
 	0.01)
--- a/lisp/net/imap.el	Mon Aug 30 22:42:25 2010 +0000
+++ b/lisp/net/imap.el	Tue Aug 31 00:03:58 2010 +0000
@@ -267,7 +267,7 @@
   :type 'string)
 
 (defcustom imap-read-timeout (if (string-match
-				  "windows-nt\\|os/2\\|emx\\|cygwin"
+				  "windows-nt\\|os/2\\|cygwin"
 				  (symbol-name system-type))
 				 1.0
 			       0.1)