Improve handling of searches in org-mhe.el.

Patch by Nick Dokos.

lisp/ChangeLog

@@ -1,5 +1,7 @@
 2008-05-16  Carsten Dominik  <dominik@science.uva.nl>
 
+	* org-mhe.el (org-mhe-follow-link): Improve handling of searches.
+
 	* org-publish.el (org-publish-attachment): Create publishing
 	directory if it does not yet exist.
 

lisp/org-mhe.el

@@ -71,6 +71,7 @@ supported by MH-E."
 (defvar mh-show-folder-buffer)
 (defvar mh-index-folder)
 (defvar mh-searcher)
+(defvar mh-search-regexp-builder)
 
 ;; Install the link type
 (org-add-link-type "mhe" 'org-mhe-open)
@@ -194,16 +195,17 @@ folders."
   (mh-find-path)
   (if (not article)
       (mh-visit-folder (mh-normalize-folder-name folder))
-    (setq article (org-add-angle-brackets article))
     (mh-search-choose)
     (if (equal mh-searcher 'pick)
         (progn
+	  (setq article (org-add-angle-brackets article))
           (mh-search folder (list "--message-id" article))
           (when (and org-mhe-search-all-folders
                      (not (org-mhe-get-message-real-folder)))
             (kill-this-buffer)
             (mh-search "+" (list "--message-id" article))))
-      (mh-search "+" article))
+      (mh-search "+" (funcall mh-search-regexp-builder
+			      (list (cons 'message-id article)))))
     (if (org-mhe-get-message-real-folder)
         (mh-show-msg 1)
       (kill-this-buffer)

lisp/org.el

@@ -7607,7 +7607,7 @@ operation has put the subtree."
     (apply 
      'completing-read prompt
      (lambda (string predicate &optional flag)
-       (let (rtn r s (l (length string)))
+       (let (rtn r s f (l (length string)))
 	 (cond
 	  ((eq flag nil)
 	   ;; try completion