Merge from trunk.

7 files changed, 66 insertions, 15 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5e6a6d9108a..d82391d691a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,30 @@
+2011-09-06  Alan Mackenzie  <acm@muc.de>
+
+        * isearch.el (isearch-other-meta-char): Wherever a key list is
+        unread, "unread" the prefix arg, too.  This fixes bug #8901.
+
+2011-09-05  Oleksandr Gavenko  <gavenkoa@gmail.com>  (tiny change)
+
+        * progmodes/grep.el (rgrep): Add "-type d" (bug#9414).
+
+2011-09-05  Juri Linkov  <juri@jurta.org>
+
+        * progmodes/grep.el (grep-process-setup): Fix comments (bug#8084).
+
+2011-09-05  Juri Linkov  <juri@jurta.org>
+
+        * progmodes/grep.el (grep-filter): Avoid incomplete processing by
+        keeping point where processing of grep matches begins, and
+        continue to delete remaining escape sequences from the same point.
+        (grep-filter): Make leading zero optional in "0?1;31m" because
+        git-grep emits "\033[1;31m" escape sequences unlike expected
+        "\033[01;31m" as GNU Grep does (bug#9408).
+        (grep-process-setup): Replace obsolete "ml=" with newer "sl=".
+
+2011-09-05  Juri Linkov  <juri@jurta.org>
+
+        * subr.el (y-or-n-p): Capitalize "yes".
+
 2011-09-04  Michael Albinus  <michael.albinus@gmx.de>
 
         * net/tramp.el (top): Require 'shell.  Use `tramp-unload-hook' but
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 9d719136cc1..2e0cc11279a 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,15 @@
+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
diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index fd441c46d17..bb8c719a4fd 100644
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.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
diff --git a/lisp/gnus/nnir.el b/lisp/gnus/nnir.el
index 17fc3f3fe81..0be6a17d50e 100644
--- a/lisp/gnus/nnir.el
+++ b/lisp/gnus/nnir.el
@@ -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)
diff --git a/lisp/isearch.el b/lisp/isearch.el
index 6eab3dbcbc4..7f54067f9aa 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -1920,6 +1920,7 @@ Isearch mode."
            (if (lookup-key global-map key)
                (progn
                  (isearch-done)
+                 (setq prefix-arg arg)
                  (apply 'isearch-unread keylist))
              (setq keylist
                    (listify-key-sequence (lookup-key local-function-key-map key)))
@@ -1935,6 +1936,7 @@ Isearch mode."
                      (setq keylist (cdr keylist)))
                  ;; As the remaining keys in KEYLIST can't be handled
                  ;; here, we must reread them.
+                 (setq prefix-arg arg)
                  (apply 'isearch-unread keylist)
                  (setq keylist nil)))))
           (
@@ -1957,8 +1959,10 @@ Isearch mode."
                                isearch-other-control-char)))))
            (setcar keylist (- main-event (- ?\C-\S-a ?\C-a)))
            (cancel-kbd-macro-events)
+           (setq prefix-arg arg)
            (apply 'isearch-unread keylist))
           ((eq search-exit-option 'edit)
+           (setq prefix-arg arg)
            (apply 'isearch-unread keylist)
            (isearch-edit-string))
           ;; Handle a scrolling function.
@@ -1987,6 +1991,7 @@ Isearch mode."
            (isearch-edit-string))
           (search-exit-option
            (let (window)
+             (setq prefix-arg arg)
              (isearch-unread-key-sequence keylist)
              (setq main-event (car unread-command-events))
 
diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el
index 709f01444bf..de46dc19169 100644
--- a/lisp/progmodes/grep.el
+++ b/lisp/progmodes/grep.el
@@ -446,9 +446,10 @@ Set up `compilation-exit-message-function' and run `grep-setup-hook'."
   (when (eq grep-highlight-matches 'auto-detect)
     (grep-compute-defaults))
   (unless (or (eq grep-highlight-matches 'auto-detect)
-              ;; Uses font-lock to parse color escapes.  (Bug#8084)
-              (null font-lock-mode)
-              (null grep-highlight-matches))
+              (null grep-highlight-matches)
+              ;; Don't output color escapes if they can't be
+              ;; highlighted with `font-lock-face' by `grep-filter'.
+              (null font-lock-mode))
     ;; `setenv' modifies `process-environment' let-bound in `compilation-start'
     ;; Any TERM except "dumb" allows GNU grep to use `--color=auto'
     (setenv "TERM" "emacs-grep")
@@ -459,7 +460,7 @@ Set up `compilation-exit-message-function' and run `grep-setup-hook'."
     ;; GREP_COLOR is used in GNU grep 2.5.1, but deprecated in later versions
     (setenv "GREP_COLOR" "01;31")
     ;; GREP_COLORS is used in GNU grep 2.5.2 and later versions
-    (setenv "GREP_COLORS" "mt=01;31:fn=:ln=:bn=:se=:ml=:cx=:ne"))
+    (setenv "GREP_COLORS" "mt=01;31:fn=:ln=:bn=:se=:sl=:cx=:ne"))
   (set (make-local-variable 'compilation-exit-message-function)
        (lambda (status code msg)
          (if (eq status 'exit)
@@ -480,20 +481,21 @@ Set up `compilation-exit-message-function' and run `grep-setup-hook'."
 This function is called from `compilation-filter-hook'."
   (save-excursion
     (forward-line 0)
-    (let ((end (point)))
+    (let ((end (point)) beg)
       (goto-char compilation-filter-start)
       (forward-line 0)
+      (setq beg (point))
       ;; Only operate on whole lines so we don't get caught with part of an
       ;; escape sequence in one chunk and the rest in another.
       (when (< (point) end)
         (setq end (copy-marker end))
         ;; Highlight grep matches and delete marking sequences.
-        (while (re-search-forward "\033\\[01;31m\\(.*?\\)\033\\[[0-9]*m" end 1)
+        (while (re-search-forward "\033\\[0?1;31m\\(.*?\\)\033\\[[0-9]*m" end 1)
           (replace-match (propertize (match-string 1)
                                      'face nil 'font-lock-face grep-match-face)
                          t t))
         ;; Delete all remaining escape sequences
-        (goto-char compilation-filter-start)
+        (goto-char beg)
         (while (re-search-forward "\033\\[[0-9;]*[mK]" end 1)
           (replace-match "" t t))))))
 
@@ -987,7 +989,8 @@ This command shares argument histories with \\[lgrep] and \\[grep-find]."
                       dir
                       (concat
                        (and grep-find-ignored-directories
-                            (concat (shell-quote-argument "(")
+                            (concat "-type d "
+                                    (shell-quote-argument "(")
                                     ;; we should use shell-quote-argument here
                                     " -path "
                                     (mapconcat
diff --git a/lisp/subr.el b/lisp/subr.el
index b49a20e7f6e..a2676b1173d 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -2254,7 +2254,7 @@ is nil and `use-dialog-box' is non-nil."
              (listp last-nonmenu-event)
              use-dialog-box)
         (setq answer
-              (x-popup-dialog t `(,prompt ("yes" . act) ("No" . skip))))
+              (x-popup-dialog t `(,prompt ("Yes" . act) ("No" . skip))))
       (setq prompt (concat prompt
                            (if (eq ?\s (aref prompt (1- (length prompt))))
                                "" " ")