[Emacs-diffs] /srv/bzr/emacs/trunk r103371: Merge changes made in Gnus trunk.

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 103371
author: Lars Ingebrigtsen <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Mon 2011-02-21 13:29:15 +0000
message:
  Merge changes made in Gnus trunk.
  
  gnus.texi (Window Layout): Document layout names.
  nntp.el (nntp-finish-retrieve-group-infos): Add a kludge to use the given 
method as in the group name if we're using an extended method.
   (nntp-finish-retrieve-group-infos): Wait for the end of the LIST ACTIVE 
command, if we're using that, instead of waiting for the beginning.
  gnus-start.el (gnus-get-unread-articles): Extend the methods so that we're 
sure to get unique server names, and we don't output two async commands in the 
same buffer.  This fixes an NNTP hang for some users.
  netrc.el (netrc-parse): Comment fix.
  gnus-sum.el (gnus-summary-next-article): Add a kludge to reselect the summary 
buffer before reading going to the next buffer.  This avoids putting the point 
in the group buffer if you `C-g' the command.
  auth-source.el (auth-source-netrc-parse): Add an in-memory netrc cache (for 
now) to make ~/.authinfo.gpg files usable.
  nnfolder.el (copyright-update): Define for the compiler.
  auth-source.el (auth-source-search): Fix unbound variable.
modified:
  doc/misc/ChangeLog
  doc/misc/gnus.texi
  lisp/ChangeLog
  lisp/gnus/ChangeLog
  lisp/gnus/auth-source.el
  lisp/gnus/gnus-start.el
  lisp/gnus/gnus-sum.el
  lisp/gnus/nnfolder.el
  lisp/gnus/nntp.el
  lisp/net/netrc.el

=== modified file 'doc/misc/ChangeLog'
--- a/doc/misc/ChangeLog        2011-02-19 20:36:54 +0000
+++ b/doc/misc/ChangeLog        2011-02-21 13:29:15 +0000
@@ -1,3 +1,7 @@
+2011-02-20  Lars Ingebrigtsen  <address@hidden>
+
+       * gnus.texi (Window Layout): Document layout names.
+
 2011-02-19  Eli Zaretskii  <address@hidden>
 
        * ada-mode.texi: Sync @dircategory with ../../info/dir.

=== modified file 'doc/misc/gnus.texi'
--- a/doc/misc/gnus.texi        2011-02-19 19:40:59 +0000
+++ b/doc/misc/gnus.texi        2011-02-21 13:29:15 +0000
@@ -22823,6 +22823,81 @@
 to fiddle with @code{gnus-tree-minimize-window} to avoid having the
 windows resized.
 
address@hidden Window Configuration Names
+
+Here's a list of most of the currently known window configurations,
+and when they're used:
+
address@hidden @code
address@hidden group
+The group buffer.
+
address@hidden summary
+Entering a group and showing only the summary.
+
address@hidden article
+Selecting an article.
+
address@hidden server
+The server buffer.
+
address@hidden browse
+Browsing groups from the server buffer.
+
address@hidden message
+Composing a (new) message.
+
address@hidden only-article
+Showing only the article buffer.
+
address@hidden edit-article
+Editing an article.
+
address@hidden edit-form
+Editing group parameters and the like.
+
address@hidden edit-score
+Editing a server definition.
+
address@hidden post
+Composing a news message.
+
address@hidden reply
+Replying or following up an article without yanking the text.
+
address@hidden forward
+Forwarding a message.
+
address@hidden reply-yank
+Replying or following up an article with yanking the text.
+
address@hidden mail-bound
+Bouncing a message.
+
address@hidden pipe
+Sending an article to an external process.
+
address@hidden bug
+Sending a bug report.
+
address@hidden score-trace
+Displaying the score trace.
+
address@hidden score-words
+Displaying the score words.
+
address@hidden split-trace
+Displaying the split trace.
+
address@hidden compose-bounce
+Composing a bounce message.
+
address@hidden mml-preview
+Previewing a @acronym{MIME} part.
+
address@hidden itemize
+
+
 @subsection Example Window Configurations
 
 @itemize @bullet

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-02-21 06:03:36 +0000
+++ b/lisp/ChangeLog    2011-02-21 13:29:15 +0000
@@ -1,3 +1,7 @@
+2011-02-21  Lars Ingebrigtsen  <address@hidden>
+
+       * net/netrc.el (netrc-parse): Comment fix.
+
 2011-02-21  Chong Yidong  <address@hidden>
 
        * color.el (color-name-to-rgb): Rename from color-rgb->normalize.

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2011-02-21 06:03:36 +0000
+++ b/lisp/gnus/ChangeLog       2011-02-21 13:29:15 +0000
@@ -4,6 +4,30 @@
        color-rgb-to-hex, color-name-to-rgb, color-srgb-to-lab, and
        color-lab-to-srgb.
 
+2011-02-21  Lars Ingebrigtsen  <address@hidden>
+
+       * nntp.el (nntp-finish-retrieve-group-infos): Add a kludge to use the
+       given method as in the group name if we're using an extended method.
+       (nntp-finish-retrieve-group-infos): Wait for the end of the LIST ACTIVE
+       command, if we're using that, instead of waiting for the beginning.
+
+       * gnus-start.el (gnus-get-unread-articles): Extend the methods so that
+       we're sure to get unique server names, and we don't output two async
+       commands in the same buffer.  This fixes an NNTP hang for some users.
+
+2011-02-21  Lars Ingebrigtsen  <address@hidden>
+
+       * gnus-sum.el (gnus-summary-next-article): Add a kludge to reselect the
+       summary buffer before reading going to the next buffer.  This avoids
+       putting the point in the group buffer if you `C-g' the command.
+
+       * auth-source.el (auth-source-netrc-parse): Add an in-memory netrc
+       cache (for now) to make ~/.authinfo.gpg files usable.
+
+       * nnfolder.el (copyright-update): Define for the compiler.
+
+       * auth-source.el (auth-source-search): Fix unbound variable.
+
 2011-02-19  Glenn Morris  <address@hidden>
 
        * gnus.el (gnus-meta): Doc fix.

=== modified file 'lisp/gnus/auth-source.el'
--- a/lisp/gnus/auth-source.el  2011-02-18 23:15:24 +0000
+++ b/lisp/gnus/auth-source.el  2011-02-21 13:29:15 +0000
@@ -500,7 +500,7 @@
                      unless (memq (nth i spec) ignored-keys)
                      collect (nth i spec)))
          (found (auth-source-recall spec))
-         filtered-backends accessor-key found-here goal matches)
+         filtered-backends accessor-key found-here goal matches backend)
 
     (if (and found auth-source-do-cache)
         (auth-source-do-debug
@@ -680,6 +680,8 @@
 
 ;;; Backend specific parsing: netrc/authinfo backend
 
+(defvar auth-source-netrc-cache nil)
+
 ;;; (auth-source-netrc-parse "~/.authinfo.gpg")
 (defun* auth-source-netrc-parse (&rest
                                  spec
@@ -698,7 +700,19 @@
               (max (or max 5000))       ; sanity check: default to stop at 5K
               (modified 0)
               alist elem result pair)
-          (insert-file-contents file)
+         (if (and auth-source-netrc-cache
+                  (equal (car auth-source-netrc-cache)
+                         (nth 5 (file-attributes file))))
+             (insert (base64-decode-string
+                      (rot13-string (cdr auth-source-netrc-cache))))
+           (insert-file-contents file)
+           (when (string-match "\\.gpg\\'" file)
+             ;; Store the contents of the file heavily encrypted in memory.
+             (setq auth-source-netrc-cache
+                   (cons (nth 5 (file-attributes file))
+                         (rot13-string
+                          (base64-encode-string
+                           (buffer-string)))))))
           (goto-char (point-min))
           ;; Go through the file, line by line.
           (while (and (not (eobp))

=== modified file 'lisp/gnus/gnus-start.el'
--- a/lisp/gnus/gnus-start.el   2011-02-15 11:24:37 +0000
+++ b/lisp/gnus/gnus-start.el   2011-02-21 13:29:15 +0000
@@ -1675,7 +1675,20 @@
                (lambda (c1 c2)
                  (< (gnus-method-rank (cadr c1) (car c1))
                     (gnus-method-rank (cadr c2) (car c2))))))
-
+    ;; Go through the list of servers and possibly extend methods that
+    ;; aren't equal (and that need extension; i.e., they are async).
+    (let ((methods nil))
+      (dolist (elem type-cache)
+       (destructuring-bind (method method-type infos dummy) elem
+         (let ((gnus-opened-servers methods))
+           (when (and (gnus-similar-server-opened method)
+                      (gnus-check-backend-function
+                       'retrieve-group-data-early (car method)))
+             (setq method (gnus-server-extend-method
+                           (gnus-info-group (car infos))
+                           method))
+             (setcar elem method))
+           (push (list method 'ok) methods)))))
     ;; Start early async retrieval of data.
     (dolist (elem type-cache)
       (destructuring-bind (method method-type infos dummy) elem

=== modified file 'lisp/gnus/gnus-sum.el'
--- a/lisp/gnus/gnus-sum.el     2011-02-16 23:12:47 +0000
+++ b/lisp/gnus/gnus-sum.el     2011-02-21 13:29:15 +0000
@@ -7734,6 +7734,7 @@
          (point
           (with-current-buffer gnus-group-buffer
             (point)))
+         (current-summary (current-buffer))
          (group
           (if (eq gnus-keep-same-level 'best)
               (gnus-summary-best-group gnus-newsgroup-name)
@@ -7758,6 +7759,10 @@
          (gnus-summary-next-group nil group backward)))
        (t
        (when (gnus-key-press-event-p last-input-event)
+         ;; Somehow or other, we may now have selected a different
+         ;; window.  Make point go back to the summary buffer.
+         (when (eq current-summary (current-buffer))
+           (select-window (get-buffer-window current-summary)))
          (gnus-summary-walk-group-buffer
           gnus-newsgroup-name cmd unread backward point))))))))
 

=== modified file 'lisp/gnus/nnfolder.el'
--- a/lisp/gnus/nnfolder.el     2011-02-19 19:40:59 +0000
+++ b/lisp/gnus/nnfolder.el     2011-02-21 13:29:15 +0000
@@ -1083,6 +1083,8 @@
         (or nnfolder-nov-directory nnfolder-directory)))
     (concat (nnfolder-group-pathname group) nnfolder-nov-file-suffix)))
 
+(defvar copyright-update)
+
 (defun nnfolder-save-buffer ()
   "Save the buffer."
   (when (buffer-modified-p)

=== modified file 'lisp/gnus/nntp.el'
--- a/lisp/gnus/nntp.el 2011-02-15 11:24:37 +0000
+++ b/lisp/gnus/nntp.el 2011-02-21 13:29:15 +0000
@@ -808,7 +808,11 @@
                      (progn
                        (goto-char last-point)
                        ;; Count replies.
-                       (while (re-search-forward "^[0-9]" nil t)
+                       (while (re-search-forward
+                               (if nntp-server-list-active-group
+                                   "^[.]"
+                                 "^[0-9]")
+                               nil t)
                          (incf received))
                        (setq last-point (point))
                        (< received count)))
@@ -828,8 +832,13 @@
                             (progn (forward-line 1) (point))))
            (nntp-copy-to-buffer nntp-server-buffer (point-min) (point-max))
            (with-current-buffer nntp-server-buffer
-             (gnus-active-to-gnus-format method gnus-active-hashtb
-                                         nil t))))))))
+             (gnus-active-to-gnus-format
+              ;; Kludge to use the extended method name if you have
+              ;; an extended one.
+              (if (consp (gnus-info-method (car infos)))
+                  (gnus-info-method (car infos))
+                method)
+              gnus-active-hashtb nil t))))))))
 
 (deffoo nntp-retrieve-groups (groups &optional server)
   "Retrieve group info on GROUPS."

=== modified file 'lisp/net/netrc.el'
--- a/lisp/net/netrc.el 2011-01-25 04:08:28 +0000
+++ b/lisp/net/netrc.el 2011-02-21 13:29:15 +0000
@@ -63,10 +63,10 @@
              alist elem result pair)
           (if (and netrc-cache
                   (equal (car netrc-cache) (nth 5 (file-attributes file))))
-             ;; Store the contents of the file heavily encrypted in memory.
              (insert (base64-decode-string (rot13-string (cdr netrc-cache))))
            (insert-file-contents file)
            (when (string-match "\\.gpg\\'" file)
+             ;; Store the contents of the file heavily encrypted in memory.
              (setq netrc-cache (cons (nth 5 (file-attributes file))
                                      (rot13-string
                                       (base64-encode-string