From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Mike Kupfer Newsgroups: gmane.emacs.devel Subject: [PATCH] MH-E: handle removal of mhparam libdir from nmh 1.8 Date: Mon, 16 Jan 2023 16:04:03 -0800 Message-ID: <152405.1673913843@alto> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="5938"; mail-complaints-to="usenet@ciao.gmane.io" To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Tue Jan 17 01:05:04 2023 Return-path: Envelope-to: ged-emacs-devel@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1pHZTK-0001Em-8X for ged-emacs-devel@m.gmane-mx.org; Tue, 17 Jan 2023 01:05:02 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pHZSh-000810-7B; Mon, 16 Jan 2023 19:04:23 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pHZSc-00080X-RN for emacs-devel@gnu.org; Mon, 16 Jan 2023 19:04:19 -0500 Original-Received: from shell1.rawbw.com ([198.144.192.42]) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pHZSW-0004sy-L0 for emacs-devel@gnu.org; Mon, 16 Jan 2023 19:04:18 -0500 Original-Received: from alto (135-180-174-133.dsl.dynamic.sonic.net [135.180.174.133] (may be forged)) (authenticated bits=0) by shell1.rawbw.com (8.15.1/8.15.1) with ESMTPSA id 30H043ln015933 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for ; Mon, 16 Jan 2023 16:04:09 -0800 (PST) (envelope-from kupfer@rawbw.com) X-Authentication-Warning: shell1.rawbw.com: Host 135-180-174-133.dsl.dynamic.sonic.net [135.180.174.133] (may be forged) claimed to be alto X-Mailer: MH-E 8.6+git; nmh 1.7.1; GNU Emacs 28.1 Received-SPF: pass client-ip=198.144.192.42; envelope-from=kupfer@rawbw.com; helo=shell1.rawbw.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.devel:302469 Archived-At: --=-=-= Content-Type: text/plain nmh 1.8 has not been released yet, but the first release candidate is out. I haven't had time to test it yet, but a user has reported that the mh-version command breaks with it. That is, mh-version is only able to report a few things before erroring out on a nil value where a string was expected. The attached patch fixes the problem and works on older nmh releases as well as 1.8. Is it okay for emacs-29? thanks, mike --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0001-MH-E-handle-removal-of-mhparam-libdir-from-nmh-1.8.patch Content-Description: proposed patch >From 77baa31a2f2dba1a5c83fc9d74c44628207616b7 Mon Sep 17 00:00:00 2001 From: Mike Kupfer Date: Mon, 16 Jan 2023 13:50:49 -0800 Subject: [PATCH] MH-E: handle removal of mhparam libdir from nmh 1.8 * lisp/mh-e/mh-e.el (mh-variant-nmh-info): If "libdir" doesn't work, try "libexecdir" (SF#491). --- lisp/mh-e/mh-e.el | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lisp/mh-e/mh-e.el b/lisp/mh-e/mh-e.el index 1640c23e002..34c809a5ecd 100644 --- a/lisp/mh-e/mh-e.el +++ b/lisp/mh-e/mh-e.el @@ -764,6 +764,8 @@ mh-variant-nmh-info ;; Sample '-version' outputs: ;; 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 + ;; "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))) (when (mh-file-command-p install-mh) (erase-buffer) @@ -774,7 +776,8 @@ mh-variant-nmh-info (mh-progs dir)) `(,version (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-progs ,dir) (flists ,(file-exists-p -- 2.30.2 --=-=-=--