(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).

2 files changed, 16 insertions, 4 deletions

diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog
index ecb4f502ed9..2f3f29596d0 100644
--- a/lisp/mh-e/ChangeLog
+++ b/lisp/mh-e/ChangeLog
@@ -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-search.el (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 --git a/lisp/mh-e/mh-search.el b/lisp/mh-e/mh-search.el
index 62c130bb90f..191e42f734a 100644
--- a/lisp/mh-e/mh-search.el
+++ b/lisp/mh-e/mh-search.el
@@ -318,9 +318,9 @@ folder containing the index search results."
 
         (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 @@ being the list of messages originally from that folder."
   (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 @@ construct the base name."
          (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."