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

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 105663
author: Gnus developers <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Mon 2011-09-05 22:07:34 +0000
message:
  Merge changes made in Gnus trunk.
  
  gnus-sum.el (gnus-summary-exit): Ensure we kill the proper 
original-article-buffer.
  nnir.el (nnir-compose-result): Fix matching of server type.
   (nnir-run-swish++): Ditto.
   (nnir-run-namazu): Ditto.
   (nnir-run-notmuch): Ditto.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/gnus-sum.el
  lisp/gnus/nnir.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2011-09-04 22:17:09 +0000
+++ b/lisp/gnus/ChangeLog       2011-09-05 22:07:34 +0000
@@ -1,3 +1,15 @@
+2011-09-05  Andrew Cohen  <address@hidden>
+
+       * gnus-sum.el (gnus-summary-exit): Ensure we kill the proper
+       original-article-buffer.
+
+2011-09-05  Kan-Ru Chen  <address@hidden>
+
+       * nnir.el (nnir-compose-result): Fix matching of server type.
+       (nnir-run-swish++): Ditto.
+       (nnir-run-namazu): Ditto.
+       (nnir-run-notmuch): Ditto.
+
 2011-09-04  Lars Magne Ingebrigtsen  <address@hidden>
 
        * gnus.el (gnus-home-directory): Add warning about setting in .gnus.el

=== modified file 'lisp/gnus/gnus-sum.el'
--- a/lisp/gnus/gnus-sum.el     2011-09-01 13:25:09 +0000
+++ b/lisp/gnus/gnus-sum.el     2011-09-05 22:07:34 +0000
@@ -7214,6 +7214,7 @@
         (quit-config (gnus-group-quit-config gnus-newsgroup-name))
         (gnus-group-is-exiting-p t)
         (article-buffer gnus-article-buffer)
+        (original-article-buffer gnus-original-article-buffer)
         (mode major-mode)
         (group-point nil)
         (buf (current-buffer))
@@ -7290,7 +7291,7 @@
            (unless (eq major-mode 'gnus-sticky-article-mode)
              (gnus-kill-buffer article-buffer)
              (setq gnus-article-current nil))))
-       (gnus-kill-buffer gnus-original-article-buffer))
+       (gnus-kill-buffer original-article-buffer))
 
       ;; Clear the current group name.
       (unless quit-config

=== modified file 'lisp/gnus/nnir.el'
--- a/lisp/gnus/nnir.el 2011-08-04 00:58:07 +0000
+++ b/lisp/gnus/nnir.el 2011-09-05 22:07:34 +0000
@@ -806,7 +806,7 @@
     ;; remove trailing slash and, for nnmaildir, cur/new/tmp
     (setq dirnam
          (substring dirnam 0
-                    (if (string= (gnus-group-server server) "nnmaildir")
+                    (if (string-match "^nnmaildir:" (gnus-group-server server))
                         -5 -1)))
 
     ;; Set group to dirnam without any leading dots or slashes,
@@ -816,7 +816,7 @@
                  "[/\\]" "." t)))
 
     (vector (gnus-group-full-name group server)
-           (if (string= (gnus-group-server server) "nnmaildir")
+           (if (string-match "^nnmaildir:" (gnus-group-server server))
                (nnmaildir-base-name-to-article-number
                 (substring article 0 (string-match ":" article))
                 group nil)
@@ -1073,7 +1073,8 @@
           ;; is sufficient.  Note that we can't only use the value of
           ;; nnml-use-compressed-files because old articles might have been
           ;; saved with a different value.
-          (article-pattern (if (string= (gnus-group-server server) "nnmaildir")
+          (article-pattern (if (string-match "^nnmaildir:"
+                                             (gnus-group-server server))
                                ":[0-9]+"
                              "^[0-9]+\\(\\.[a-z0-9]+\\)?$"))
            score artno dirnam filenam)
@@ -1315,7 +1316,8 @@
   ;; (when group
   ;;   (error "The Namazu backend cannot search specific groups"))
   (save-excursion
-    (let ((article-pattern (if (string= (gnus-group-server server) "nnmaildir")
+    (let ((article-pattern (if (string-match "^nnmaildir:"
+                                            (gnus-group-server server))
                               ":[0-9]+"
                             "^[0-9]+$"))
           artlist
@@ -1388,7 +1390,8 @@
           (groupspec (cdr (assq 'group query)))
           (prefix (nnir-read-server-parm 'nnir-notmuch-remove-prefix server))
            artlist
-           (article-pattern (if (string= (gnus-group-server server) 
"nnmaildir")
+          (article-pattern (if (string-match "^nnmaildir:"
+                                             (gnus-group-server server))
                               ":[0-9]+"
                             "^[0-9]+$"))
            artno dirnam filenam)