From: Katsumi Yamaoka <yamaoka@jpl.org>
Date: Mon, 30 Aug 2010 06:10:18 +0000 (+0000)
Subject: Misc Gnus fixes by Lars Magne Ingebrigtsen <larsi@gnus.org>.
X-Git-Url: http://git.hcoop.net/bpt/emacs.git/commitdiff_plain/6b8382e49d697fa1b095d4a2cd3e53b1a2f498ec

Misc Gnus fixes by Lars Magne Ingebrigtsen <larsi@gnus.org>.

2010-08-28  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 * gnus.el (gnus-valid-select-methods): Remove reference to nngoogle,
 which doesn't exist.

 * message.el (message-inhibit-ecomplete): New variable to allow some
 function to inhibit ecomplete address storage.
 (message-resend): Disable ecomplete message storage when resending
 messages.

 * nntp.el (nntp-async-kluge): Remove the Emacs 20.3-related kluge.
---

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 356cf95285..d0ba8abf24 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,15 @@
+2010-08-28  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+	* gnus.el (gnus-valid-select-methods): Remove reference to nngoogle,
+	which doesn't exist.
+
+	* message.el (message-inhibit-ecomplete): New variable to allow some
+	function to inhibit ecomplete address storage.
+	(message-resend): Disable ecomplete message storage when resending
+	messages.
+
+	* nntp.el (nntp-async-kluge): Remove the Emacs 20.3-related kluge.
+
 2010-08-27  Katsumi Yamaoka  <yamaoka@jpl.org>
 
 	* gnus-sum.el (gnus-summary-move-article, gnus-summary-delete-article):
diff --git a/lisp/gnus/gnus.el b/lisp/gnus/gnus.el
index 945bd41eeb..41f579dcfd 100644
--- a/lisp/gnus/gnus.el
+++ b/lisp/gnus/gnus.el
@@ -1746,7 +1746,6 @@ slower."
     ("nnfolder" mail respool address)
     ("nngateway" post-mail address prompt-address physical-address)
     ("nnweb" none)
-    ("nngoogle" post)
     ("nnslashdot" post)
     ("nnultimate" none)
     ("nnrss" none)
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 947b1bd53e..357c8705ae 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -1739,6 +1739,7 @@ You must have the \"hashcash\" binary installed, see `hashcash-path'."
 (defvar message-mime-part nil)
 (defvar message-posting-charset nil)
 (defvar message-inserted-headers nil)
+(defvar message-inhibit-ecomplete nil)
 
 ;; Byte-compiler warning
 (defvar gnus-active-hashtb)
@@ -4091,7 +4092,8 @@ It should typically alter the sending method in some way or other."
 	(run-hooks 'message-sent-hook))
       (message "Sending...done")
       ;; Do ecomplete address snarfing.
-      (when (message-mail-alias-type-p 'ecomplete)
+      (when (and (message-mail-alias-type-p 'ecomplete)
+		 (not message-inhibit-ecomplete))
 	(message-put-addresses-in-ecomplete))
       ;; Mark the buffer as unmodified and delete auto-save.
       (set-buffer-modified-p nil)
@@ -7425,6 +7427,7 @@ is for the internal use."
 	(replace-match "X-From-Line: "))
       ;; Send it.
       (let ((message-inhibit-body-encoding t)
+	    (message-inhibit-ecomplete t)
 	    message-required-mail-headers
 	    message-generate-hashcash
 	    rfc2047-encode-encoded-words)
diff --git a/lisp/gnus/nntp.el b/lisp/gnus/nntp.el
index 03e0168de4..af04402d84 100644
--- a/lisp/gnus/nntp.el
+++ b/lisp/gnus/nntp.el
@@ -298,13 +298,6 @@ to insert Cancel-Lock headers.")
 (defvoo nntp-server-xover 'try)
 (defvoo nntp-server-list-active-group 'try)
 
-(defvar nntp-async-needs-kluge
-  (string-match "^GNU Emacs 20\\.3\\." (emacs-version))
-  "*When non-nil, nntp will poll asynchronous connections
-once a second.  By default, this is turned on only for Emacs
-20.3, which has a bug that breaks nntp's normal method of
-noticing asynchronous data.")
-
 (defvar nntp-async-timer nil)
 (defvar nntp-async-process-list nil)
 
@@ -1368,17 +1361,7 @@ password contained in '~/.nntp-authinfo'."
 	  nntp-process-decode decode
 	  nntp-process-callback callback
 	  nntp-process-start-point (point-max))
-    (setq after-change-functions '(nntp-after-change-function))
-    (if nntp-async-needs-kluge
-	(nntp-async-kluge process))))
-
-(defun nntp-async-kluge (process)
-  ;; emacs 20.3 bug: process output with encoding 'binary
-  ;; doesn't trigger after-change-functions.
-  (unless nntp-async-timer
-    (setq nntp-async-timer
-	  (run-at-time 1 1 'nntp-async-timer-handler)))
-  (add-to-list 'nntp-async-process-list process))
+    (setq after-change-functions '(nntp-after-change-function))))
 
 (defun nntp-async-timer-handler ()
   (mapcar