procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

MH-E: handle removal of mhparam libdir from nmh 1.8

Browse source 
* lisp/mh-e/mh-e.el (mh-variant-nmh-info): If "libdir" doesn't
work, try "libexecdir" (Bug#60952) (SF#491).
This commit is contained in:
Mike Kupfer 2023-01-16 13:50:49 -08:00
parent d63e1a8951
commit b3de81a6ee
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/mh-e/mh-e.el
View file

@ -764,6 +764,8 @@ This assumes that a temporary buffer is set up."
;; Sample '-version' outputs: ;; Sample '-version' outputs:
;; mhparam -- nmh-1.1-RC1 [compiled on chaak at Fri Jun 20 11:03:28 PDT 2003] ;; mhparam -- nmh-1.1-RC1 [compiled on chaak at Fri Jun 20 11:03:28 PDT 2003]
;; install-mh -- nmh-1.7.1 built October 26, 2019 on build-server-000 ;; install-mh -- nmh-1.7.1 built October 26, 2019 on build-server-000
;; "libdir" was deprecated in nmh-1.7 in favor of "libexecdir", and
;; removed completely in nmh-1.8.
(let ((install-mh (expand-file-name "install-mh" dir))) (let ((install-mh (expand-file-name "install-mh" dir)))
(when (mh-file-command-p install-mh) (when (mh-file-command-p install-mh)
(erase-buffer) (erase-buffer)
@ -774,7 +776,8 @@ This assumes that a temporary buffer is set up."
(mh-progs dir)) (mh-progs dir))
`(,version `(,version
(variant nmh) (variant nmh)
(mh-lib-progs ,(mh-profile-component "libdir")) (mh-lib-progs ,(or (mh-profile-component "libdir")
(mh-profile-component "libexecdir")))
(mh-lib ,(mh-profile-component "etcdir")) (mh-lib ,(mh-profile-component "etcdir"))
(mh-progs ,dir) (mh-progs ,dir)
(flists ,(file-exists-p (flists ,(file-exists-p