emacs-nmhlocation.patch

   1 --- emacs-20.4/lisp/mail/mh-utils.el.nmh        Thu Jul 22 17:32:51 1999
   2 +++ emacs-20.4/lisp/mail/mh-utils.el    Thu Jul 22 17:38:01 1999
   3 @@ -606,6 +606,7 @@
   4             (or (mh-path-search exec-path "inc")
   5                 (mh-path-search '("/usr/local/bin/mh/"
   6                                   "/usr/local/mh/"
   7 +                                 "/usr/bin/" ;Red Hat GNU/Linux
   8                                   "/usr/bin/mh/" ;Ultrix 4.2
   9                                   "/usr/new/mh/" ;Ultrix <4.2
  10                                   "/usr/contrib/mh/bin/" ;BSDI
  11 @@ -617,7 +618,7 @@
  12        (let ((mh-base mh-progs))
  13         (while (let ((dir-name (file-name-nondirectory
  14                                 (directory-file-name mh-base))))
  15 -                (or (string= "mh" dir-name)
  16 +                (or (string= "nmh" dir-name)
  17                      (string= "bin" dir-name)))
  18           (setq mh-base
  19                 (file-name-directory (directory-file-name mh-base))))
  20 @@ -629,7 +630,7 @@
  21                   ;; components, then look for lib/mh or mh/lib.
  22                   (or (mh-path-search
  23                        (mapcar (lambda (p) (expand-file-name p mh-base))
  24 -                              '("lib/mh" "etc/nmh" "/etc/nmh" "mh/lib"))
  25 +                              '("lib/nmh" "etc/nmh" "/etc/nmh" "mh/lib"))
  26                        "components"
  27                        'file-exists-p))))
  28         (or (and mh-lib-progs
  29 @@ -637,7 +638,7 @@
  30             (setq mh-lib-progs
  31                   (or (mh-path-search
  32                        (mapcar (lambda (p) (expand-file-name p mh-base))
  33 -                              '("lib/mh" "libexec/nmh" "lib/nmh" "mh/lib"))
  34 +                              '("lib/nmh" "libexec/nmh" "lib/mh" "mh/lib"))
  35                        "mhl")
  36                       (mh-path-search '("/usr/local/bin/mh/") "mhl")
  37                       (mh-path-search exec-path "mhl") ;unlikely