merge upstream

6 files changed, 70 insertions, 38 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b138d78a070..d96ad569543 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2011-07-20  Sam Steingold  <sds@gnu.org>
+
+        * progmodes/etags.el (etags-file-of-tag, etags-tags-table-files)
+        (etags-tags-included-tables): Call `convert-standard-filename' on
+        the file names contained in TAGS so that windows Emacs can handle
+        TAGS files created by cygwin ctags.
+
 2011-07-20  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
         * proced.el (proced-update): Revert yesterday's bug#1779 patch,
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index d18be47fb9d..a1cb003a8ff 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,17 @@
+2011-07-20  Andrew Cohen  <cohen@andy.bu.edu>
+
+        * nnir.el (gnus-group-make-nnir-group): Allow optional search query
+        argument.
+        (gnus-group-make-nnir-group, nnir-request-group, nnir-run-query): Use
+        `nnir-address' to handle server info rather than passing an arg.
+
+        * nnimap.el (nnimap-make-thread-query): New utility function to format
+        an imap thread search query.
+        (nnimap-request-thread): Use it.
+
+        * gnus-sum.el (gnus-handle-ephemeral-exit): Ensure we are setting the
+        right select-method if we are not going back to the group buffer.
+
 2011-07-19  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
         * gnus-group.el (gnus-group-read-ephemeral-group): Make sure we don't
diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index 86ff0180f55..6e8fc63d79f 100644
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -7339,6 +7339,9 @@ The state which existed when entering the ephemeral is reset."
   (if (not (buffer-name (car quit-config)))
       (gnus-configure-windows 'group 'force)
     (set-buffer (car quit-config))
+    (unless (eq (cdr quit-config) 'group)
+      (setq gnus-current-select-method
+            (gnus-find-method-for-group gnus-newsgroup-name)))
     (cond ((eq major-mode 'gnus-summary-mode)
            (gnus-set-global-variables))
           ((eq major-mode 'gnus-article-mode)
diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el
index ef5bee71629..385522759b6 100644
--- a/lisp/gnus/nnimap.el
+++ b/lisp/gnus/nnimap.el
@@ -1567,25 +1567,14 @@ textual parts.")
 
 (deffoo nnimap-request-thread (header &optional group server)
   (when (nnimap-possibly-change-group group server)
-      (let* ((id (mail-header-id header))
-         (refs (split-string
-                (or (mail-header-references header)
-                    "")))
-         (cmd (let ((value
-                     (format
-                      "(OR HEADER REFERENCES %s HEADER Message-Id %s)"
-                      id id)))
-                (dolist (refid refs value)
-                  (setq value (format
-                               "(OR (OR HEADER Message-Id %s HEADER REFERENCES %s) %s)"
-                               refid refid value)))))
-         (result (with-current-buffer (nnimap-buffer)
-                   (nnimap-command  "UID SEARCH %s" cmd))))
-    (when result
-      (gnus-fetch-headers
-       (and (car result) (delete 0 (mapcar #'string-to-number
-                                           (cdr (assoc "SEARCH" (cdr result))))))
-       nil t)))))
+    (let* ((cmd (nnimap-make-thread-query header))
+           (result (with-current-buffer (nnimap-buffer)
+                     (nnimap-command  "UID SEARCH %s" cmd))))
+      (when result
+        (gnus-fetch-headers
+         (and (car result) (delete 0 (mapcar #'string-to-number
+                                             (cdr (assoc "SEARCH" (cdr result))))))
+         nil t)))))
 
 (defun nnimap-possibly-change-group (group server)
   (let ((open-result t))
@@ -1951,6 +1940,21 @@ textual parts.")
                   group-art))
           nnimap-incoming-split-list)))
 
+(defun nnimap-make-thread-query (header)
+  (let* ((id  (mail-header-id header))
+         (refs (split-string
+                (or (mail-header-references header)
+                    "")))
+        (value
+         (format
+          "(OR HEADER REFERENCES %s HEADER Message-Id %s)"
+          id id)))
+    (dolist (refid refs value)
+      (setq value (format
+                   "(OR (OR HEADER Message-Id %s HEADER REFERENCES %s) %s)"
+                   refid refid value)))))
+
+
 (provide 'nnimap)
 
 ;;; nnimap.el ends here
diff --git a/lisp/gnus/nnir.el b/lisp/gnus/nnir.el
index 3f140ef59d9..9840dddcb66 100644
--- a/lisp/gnus/nnir.el
+++ b/lisp/gnus/nnir.el
@@ -296,6 +296,9 @@ is `(valuefunc member)'."
 (nnoo-declare nnir)
 (nnoo-define-basics nnir)
 
+(defvoo nnir-address nil
+  "The address of the nnir server.")
+
 (gnus-declare-backend "nnir" 'mail)
 
 
@@ -582,18 +585,17 @@ Add an entry here when adding a new search engine.")
 
 ;; Gnus glue.
 
-(defun gnus-group-make-nnir-group (nnir-extra-parms)
+(defun gnus-group-make-nnir-group (nnir-extra-parms &optional parms)
   "Create an nnir group.  Asks for query."
   (interactive "P")
   (setq nnir-current-query nil
         nnir-current-server nil
         nnir-current-group-marked nil
         nnir-artlist nil)
-  (let* ((query (read-string "Query: " nil 'nnir-search-history))
-         (parms (list (cons 'query query)))
-         (srv (if (gnus-server-server-name)
-                  "all" "")))
-    (add-to-list 'parms (cons 'unique-id (message-unique-id)) t)
+  (let* ((query (unless parms (read-string "Query: " nil 'nnir-search-history)))
+         (parms (or parms (list (cons 'query query))))
+         (srv (or (cdr (assq 'server parms)) (gnus-server-server-name) "nnir")))
+   (add-to-list 'parms (cons 'unique-id (message-unique-id)) t)
     (gnus-group-read-ephemeral-group
      (concat "nnir:" (prin1-to-string parms)) (list 'nnir srv) t
      (cons (current-buffer) gnus-current-window-configuration)
@@ -617,7 +619,7 @@ Add an entry here when adding a new search engine.")
                (equal server nnir-current-server)))
       nnir-artlist
     ;; Cache miss.
-    (setq nnir-artlist (nnir-run-query group server)))
+    (setq nnir-artlist (nnir-run-query group)))
   (with-current-buffer nntp-server-buffer
     (setq nnir-current-query group)
     (when server (setq nnir-current-server server))
@@ -1594,14 +1596,13 @@ actually)."
 
 (autoload 'gnus-group-topic-name "gnus-topic")
 
-(defun nnir-run-query (query nserver)
+(defun nnir-run-query (query)
   "Invoke appropriate search engine function (see `nnir-engines').
   If some groups were process-marked, run the query for each of the groups
   and concat the results."
   (let ((q (car (read-from-string query)))
-        (groups (if (string= "all-ephemeral" nserver)
-                    (with-current-buffer gnus-server-buffer
-                      (list (list (gnus-server-server-name))))
+        (groups (if (not (string= "nnir" nnir-address))
+                    (list (list nnir-address))
                   (nnir-categorize
                    (or gnus-group-marked
                        (if (gnus-group-group-name)
diff --git a/lisp/progmodes/etags.el b/lisp/progmodes/etags.el
index da073ceb258..a3300077909 100644
--- a/lisp/progmodes/etags.el
+++ b/lisp/progmodes/etags.el
@@ -1260,11 +1260,11 @@ buffer-local values of tags table format variables."
 (defun etags-file-of-tag (&optional relative) ; Doc string?
   (save-excursion
     (re-search-backward "\f\n\\([^\n]+\\),[0-9]*\n")
-    (let ((str (buffer-substring (match-beginning 1) (match-end 1))))
+    (let ((str (convert-standard-filename
+                (buffer-substring (match-beginning 1) (match-end 1)))))
       (if relative
           str
-        (expand-file-name str
-                          (file-truename default-directory))))))
+        (expand-file-name str (file-truename default-directory))))))
 
 
 (defun etags-tags-completion-table () ; Doc string?
@@ -1545,7 +1545,9 @@ hits the start of file."
       (end-of-line)
       (skip-chars-backward "^," beg)
       (or (looking-at "include$")
-          (setq files (cons (buffer-substring beg (1- (point))) files))))
+          (push (convert-standard-filename
+                 (buffer-substring beg (1- (point))))
+                files)))
     (nreverse files)))
 
 (defun etags-tags-included-tables () ; Doc string?
@@ -1556,10 +1558,11 @@ hits the start of file."
       (setq beg (point))
       (end-of-line)
       (skip-chars-backward "^," beg)
-      (if (looking-at "include$")
-          ;; Expand in the default-directory of the tags table buffer.
-          (setq files (cons (expand-file-name (buffer-substring beg (1- (point))))
-                            files))))
+      (when (looking-at "include$")
+        ;; Expand in the default-directory of the tags table buffer.
+        (push (expand-file-name (convert-standard-filename
+                                 (buffer-substring beg (1- (point)))))
+              files)))
     (nreverse files)))
 
 ;; Empty tags file support.