# HG changeset patch
# User Bill Wohler <wohler@newt.com>
# Date 1151615025 0
# Node ID 11d2aeb1c67aedb4831b469ec4b0a2994932fcee
# Parent  113cbc14f25cde5739462c62d702d02a59097944
(mh-search, mh-index-group-by-folder): Add "the" in loop construct to
be consistent with other loops, and because edebug doesn't work
without it.
(mh-folder-exists-p): Strip + from folder to avoid redundant +s in
regexp (closes SF #1514424).

diff -r 113cbc14f25c -r 11d2aeb1c67a lisp/mh-e/ChangeLog
--- a/lisp/mh-e/ChangeLog	Thu Jun 29 20:43:44 2006 +0000
+++ b/lisp/mh-e/ChangeLog	Thu Jun 29 21:03:45 2006 +0000
@@ -1,3 +1,14 @@
+2006-06-29  Bill Wohler  <wohler@newt.com>
+
+	* mh-search.el (mh-search, mh-index-group-by-folder): Add "the" in
+	loop construct to be consistent with other loops, and because
+	edebug doesn't work without it.
+	
+2006-06-29  Ted Phelps  <phelps@gnusto.com>  (tiny change)
+
+	(mh-folder-exists-p): Strip + from folder to avoid redundant +s in
+	regexp (closes SF #1514424).
+
 2006-06-29  Sergey Poznyakoff  <gray@Mirddin.farlep.net>  (tiny change)
 
 	* mh-mime.el (mh-mime-save-parts): Add -store option to
diff -r 113cbc14f25c -r 11d2aeb1c67a lisp/mh-e/mh-search.el
--- a/lisp/mh-e/mh-search.el	Thu Jun 29 20:43:44 2006 +0000
+++ b/lisp/mh-e/mh-search.el	Thu Jun 29 21:03:45 2006 +0000
@@ -318,9 +318,9 @@
 
         (message "%s found %s matches in %s folders"
                  (upcase-initials (symbol-name mh-searcher))
-                 (loop for msg-hash being hash-values of mh-index-data
+                 (loop for msg-hash being the hash-values of mh-index-data
                        sum (hash-table-count msg-hash))
-                 (loop for msg-hash being hash-values of mh-index-data
+                 (loop for msg-hash being the hash-values of mh-index-data
                        count (> (hash-table-count msg-hash) 0)))))))
 
 ;; Shush compiler.
@@ -1362,7 +1362,7 @@
   (save-excursion
     (goto-char (point-min))
     (let ((result-table (make-hash-table :test #'equal)))
-      (loop for msg being hash-keys of mh-index-msg-checksum-map
+      (loop for msg being the hash-keys of mh-index-msg-checksum-map
             do (push msg (gethash (car (gethash
                                         (gethash msg mh-index-msg-checksum-map)
                                         mh-index-checksum-origin-map))
@@ -1524,7 +1524,8 @@
          (with-temp-buffer
            (mh-exec-cmd-output "folder" nil "-fast" "-nocreate" folder)
            (goto-char (point-min))
-           (looking-at (format "+?%s" folder))))))
+           ;; Strip + from folder; use optional + in regexp.
+           (looking-at (format "+?%s" (substring folder 1)))))))
 
 (defun mh-msg-exists-p (msg folder)
   "Check if MSG exists in FOLDER."