(mh-send-sub): Don't find components file in current directory--this

seems to have been a side-effect of commenting out the use of an old
mh-etc variable. Improve error message.

diff --git a/lisp/mh-e/mh-comp.el b/lisp/mh-e/mh-comp.el
index 5a0907bf612667b58102c776faa1916984aafd73..2377151eeb38d90d59f06925c4a2a9274608aec3 100644 (file)
--- a/lisp/mh-e/mh-comp.el
+++ b/lisp/mh-e/mh-comp.el
@@ -759,18 +759,9 @@ CONFIG is the window configuration before sending mail."
                        (setq components
                              (expand-file-name mh-comp-formfile mh-lib)))
                       components)
-                     ((file-exists-p
-                       (setq components
-                             (expand-file-name mh-comp-formfile
-                                               ;; What is this mh-etc ??  -sm
-                                               ;; This is dead code, so
-                                               ;; remove it.
-                                        ;(and (boundp 'mh-etc) mh-etc)
-                                               )))
-                      components)
                      (t
-                      (error "Can't find components file \"%s\""
-                             components))))
+                      (error "Can't find %s in %s or %s"
+                             mh-comp-formfile mh-user-path mh-lib))))
                   nil)))
       (mh-insert-fields "To:" to "Subject:" subject "Cc:" cc)
       (goto-char (point-max))