aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Wohler2008-05-19 02:18:24 +0000
committerBill Wohler2008-05-19 02:18:24 +0000
commitb78a11dc14001e2121a9f03a899bae02f4054196 (patch)
treef07b4b12c256e3438421399a183feae2fb2bf90e
parent770ea979d41aadb09180b785fecbb6fcf652b2e2 (diff)
downloademacs-b78a11dc14001e2121a9f03a899bae02f4054196.tar.gz
emacs-b78a11dc14001e2121a9f03a899bae02f4054196.zip
(mh-find-path): Don't throw error if MH environment variable is being
used (closes SF #1946861).
-rw-r--r--lisp/mh-e/ChangeLog5
-rw-r--r--lisp/mh-e/mh-utils.el5
2 files changed, 7 insertions, 3 deletions
diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog
index a81f689d36e..12997cd7741 100644
--- a/lisp/mh-e/ChangeLog
+++ b/lisp/mh-e/ChangeLog
@@ -1,3 +1,8 @@
12008-05-19 Xavier Maillard <xma@gnu.org> (tiny change)
2
3 * mh-utils.el (mh-find-path): Don't throw error if MH environment
4 variable is being used (closes SF #1946861).
5
12008-05-19 Nick Dokos <nicholas.dokos@hp.com> (tiny change) 62008-05-19 Nick Dokos <nicholas.dokos@hp.com> (tiny change)
2 7
3 * mh-search.el (mh-mairix-regexp-builder): Add additional items to 8 * mh-search.el (mh-mairix-regexp-builder): Add additional items to
diff --git a/lisp/mh-e/mh-utils.el b/lisp/mh-e/mh-utils.el
index d330e60e5c1..08602b73466 100644
--- a/lisp/mh-e/mh-utils.el
+++ b/lisp/mh-e/mh-utils.el
@@ -184,9 +184,8 @@ MH-E."
184 (getenv "MH"))) 184 (getenv "MH")))
185 (if (null (mh-variants)) 185 (if (null (mh-variants))
186 (error "Install MH and run install-mh before running MH-E")) 186 (error "Install MH and run install-mh before running MH-E"))
187 (let ((profile "~/.mh_profile")) 187 (if (not (or (getenv "MH") (file-readable-p "~/.mh_profile")))
188 (if (not (file-readable-p profile)) 188 (error "Run install-mh before running MH-E"))
189 (error "Run install-mh before running MH-E")))
190 ;; Read MH profile. 189 ;; Read MH profile.
191 (setq mh-user-path (mh-profile-component "Path")) 190 (setq mh-user-path (mh-profile-component "Path"))
192 (if (not mh-user-path) 191 (if (not mh-user-path)