[Emacs-diffs] /srv/bzr/emacs/trunk r101210: Misc Gnus fixes by Lars Magne Ingebrigtsen <address@hidden>.

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 101210
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Mon 2010-08-30 06:10:18 +0000
message:
  Misc Gnus fixes by Lars Magne Ingebrigtsen <address@hidden>.
  
  2010-08-28  Lars Magne Ingebrigtsen  <address@hidden>
   * 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.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/gnus.el
  lisp/gnus/message.el
  lisp/gnus/nntp.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2010-08-27 01:53:01 +0000
+++ b/lisp/gnus/ChangeLog       2010-08-30 06:10:18 +0000
@@ -1,3 +1,15 @@
+2010-08-28  Lars Magne Ingebrigtsen  <address@hidden>
+
+       * 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  <address@hidden>
 
        * gnus-sum.el (gnus-summary-move-article, gnus-summary-delete-article):

=== modified file 'lisp/gnus/gnus.el'
--- a/lisp/gnus/gnus.el 2010-08-29 20:10:43 +0000
+++ b/lisp/gnus/gnus.el 2010-08-30 06:10:18 +0000
@@ -1746,7 +1746,6 @@
     ("nnfolder" mail respool address)
     ("nngateway" post-mail address prompt-address physical-address)
     ("nnweb" none)
-    ("nngoogle" post)
     ("nnslashdot" post)
     ("nnultimate" none)
     ("nnrss" none)

=== modified file 'lisp/gnus/message.el'
--- a/lisp/gnus/message.el      2010-05-12 08:24:25 +0000
+++ b/lisp/gnus/message.el      2010-08-30 06:10:18 +0000
@@ -1739,6 +1739,7 @@
 (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 @@
        (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 @@
        (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)

=== modified file 'lisp/gnus/nntp.el'
--- a/lisp/gnus/nntp.el 2010-03-19 02:55:37 +0000
+++ b/lisp/gnus/nntp.el 2010-08-30 06:10:18 +0000
@@ -298,13 +298,6 @@
 (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 @@
          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