From 6b9588145b7b1cac4e4629f7133bf88f9360c15f Mon Sep 17 00:00:00 2001
From: Gnus developers <ding@gnus.org>
Date: Fri, 1 Oct 2010 00:25:50 +0000
Subject: nnimap.el (nnimap-request-accept-article): Get the Message-ID without
 the \r. nnimap.el (nnimap-find-article-by-message-id): Use EXAMINE instead of
 SELECT to get the message-id. gnus-art.el, gnus.el, nnimap.el: Fix up
 make-obsolete-variable declarations throughout. gnus.texi (Mail Source
 Specifiers): Remove webmail.el mentions. mail-source.el: Removed webmail
 support. nntp.el (nntp-server-list-active-group): Document. gnus.texi (NNTP):
 Document nntp-server-list-active-group. gnus.texi (Customizing the IMAP
 Connection): Remove extra quote. nnimap.el
 (nnimap-find-article-by-message-id): Really return the article number.
 nnimap.el: Add nnimap-split-fancy. netrc.el (netrc-credentials,
 netrc-machine): Return the value of the "default" entry. nnimap.el: Use
 tls.el exclusively, and not starttls.el at all. nnimap.el
 (nnimap-wait-for-connection): Accept the moronic openssl s_client -starttls
 output, too. nnrss.el (nnrss-use-local): Add documentation. message.el
 (message-ignored-supersedes-headers): Strip Injection-* headers before
 superseding. nnimap.el (nnimap-open-connection): Reinstate the auto-upgrade
 from unencrypted to STARTTLS, if possible. nnir.el: Use the server names
 without suffixes. gnus-sum.el (gnus-summary-show-thread): Skip past invisible
 text when expanding threads. gnus-registry.el: Don't follow nnmairix
 references.  Install the nnregistry refer method. gnus.texi (Spam Package
 Configuration Examples, SpamOracle): Remove nnimap-split-rule from examples.

---
 lisp/gnus/mail-source.el | 63 ++----------------------------------------------
 1 file changed, 2 insertions(+), 61 deletions(-)

(limited to 'lisp/gnus/mail-source.el')

diff --git a/lisp/gnus/mail-source.el b/lisp/gnus/mail-source.el
index 648ca29b87..80a1d8846d 100644
--- a/lisp/gnus/mail-source.el
+++ b/lisp/gnus/mail-source.el
@@ -217,34 +217,6 @@ See Info node `(gnus)Mail Source Specifiers'."
 					   (const :format ""
 						  :value :dontexpunge)
 					   (boolean :tag "Dontexpunge"))
-				    (group :inline t
-					   (const :format "" :value :plugged)
-					   (boolean :tag "Plugged"))))
-		   (cons :tag "Webmail server"
-			 (const :format "" webmail)
-			 (checklist :tag "Options" :greedy t
-				    (group :inline t
-					  (const :format "" :value :subtype)
-					  ;; Should be generated from
-					  ;; `webmail-type-definition', but we
-					  ;; can't require webmail without W3.
-					  (choice :tag "Subtype"
-						  :value hotmail
-						  (const hotmail)
-						  (const yahoo)
-						  (const netaddress)
-						  (const netscape)
-						  (const my-deja)))
-				    (group :inline t
-					   (const :format "" :value :user)
-					   (string :tag "User"))
-				    (group :inline t
-					   (const :format "" :value :password)
-					   (string :tag "Password"))
-				    (group :inline t
-					   (const :format ""
-						  :value :dontexpunge)
-					   (boolean :tag "Dontexpunge"))
 				    (group :inline t
 					   (const :format "" :value :plugged)
 					   (boolean :tag "Plugged"))))))))
@@ -387,13 +359,7 @@ Common keywords should be listed here.")
        (:prescript)
        (:prescript-delay)
        (:postscript)
-       (:dontexpunge))
-      (webmail
-       (:subtype hotmail)
-       (:user (or (user-login-name) (getenv "LOGNAME") (getenv "USER")))
-       (:password)
-       (:dontexpunge)
-       (:authentication password)))
+       (:dontexpunge)))
     "Mapping from keywords to default values.
 All keywords that can be used must be listed here."))
 
@@ -402,8 +368,7 @@ All keywords that can be used must be listed here."))
     (directory mail-source-fetch-directory)
     (pop mail-source-fetch-pop)
     (maildir mail-source-fetch-maildir)
-    (imap mail-source-fetch-imap)
-    (webmail mail-source-fetch-webmail))
+    (imap mail-source-fetch-imap))
   "A mapping from source type to fetcher function.")
 
 (defvar mail-source-password-cache nil)
@@ -1138,30 +1103,6 @@ This only works when `display-time' is enabled."
 			 ?s server ?P port ?u user))
       found)))
 
-(autoload 'webmail-fetch "webmail")
-
-(defun mail-source-fetch-webmail (source callback)
-  "Fetch for webmail source."
-  (mail-source-bind (webmail source)
-    (let ((mail-source-string (format "webmail:%s:%s" subtype user))
-	  (webmail-newmail-only dontexpunge)
-	  (webmail-move-to-trash-can (not dontexpunge)))
-      (when (eq authentication 'password)
-	(setq password
-	      (or password
-		  (cdr (assoc (format "webmail:%s:%s" subtype user)
-			      mail-source-password-cache))
-		  (read-passwd
-		   (format "Password for %s at %s: " user subtype))))
-	(when (and password
-		   (not (assoc (format "webmail:%s:%s" subtype user)
-			       mail-source-password-cache)))
-	  (push (cons (format "webmail:%s:%s" subtype user) password)
-		mail-source-password-cache)))
-      (webmail-fetch mail-source-crash-box subtype user password)
-      (mail-source-callback callback (symbol-name subtype))
-      (mail-source-delete-crash-box))))
-
 (provide 'mail-source)
 
 ;;; mail-source.el ends here
-- 
cgit v1.2.3