Commit bbd6590c authored by Gnus developers's avatar Gnus developers Committed by Katsumi Yamaoka

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.
parent 697210c4
2011-09-05 Andrew Cohen <cohen@andy.bu.edu>
* gnus-sum.el (gnus-summary-exit): Ensure we kill the proper
original-article-buffer.
2011-09-05 Kan-Ru Chen <kanru@kanru.info>
* 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 <larsi@gnus.org>
* gnus.el (gnus-home-directory): Add warning about setting in .gnus.el
......
......@@ -7214,6 +7214,7 @@ If FORCE (the prefix), also save the .newsrc file(s)."
(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 @@ If FORCE (the prefix), also save the .newsrc file(s)."
(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
......
......@@ -806,7 +806,7 @@ ready to be added to the list of search results."
;; 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 @@ ready to be added to the list of search results."
"[/\\]" "." 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 @@ Windows NT 4.0."
;; 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 @@ Tested with Namazu 2.0.6 on a GNU/Linux system."
;; (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 @@ actually)."
(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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment