From aa8346dbbe26817f89457fdb00a0afdf4e61f3e4 Mon Sep 17 00:00:00 2001 From: Morgan Smith Date: Thu, 27 Aug 2026 13:49:34 -0400 Subject: gnu: emacs-minimal: Adjust patches. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/emacs.scm (emacs-minimal):[#:phases]: Substitute “bin/sh” rather than “sh” in “lisp/man.el”. Additionally patch “dd” in "jka-compr.el". * gnu/packages/patches/emacs-native-comp-fix-filenames.patch: Delete last reference to ‘startup--original-eln-load-path’. --- gnu/packages/emacs.scm | 10 ++++++---- gnu/packages/patches/emacs-native-comp-fix-filenames.patch | 10 ++++++++++ 2 files changed, 16 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index a568077f51a..492c71cc9f0 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -341,6 +341,7 @@ "lisp/term.el" "lisp/htmlfontify.el" "lisp/mail/feedmail.el" + "lisp/man.el" "lisp/obsolete/pgg-pgp.el" "lisp/obsolete/pgg-pgp5.el" "lisp/org/ob-eval.el" @@ -356,11 +357,12 @@ "lisp/mail/blessmail.el") (("\"#!/bin/sh\\\n\"") (format #f "\"#!~a~%\"" (search-input-file inputs "bin/sh")))) - (substitute* '("lisp/jka-compr.el" - "lisp/man.el") + (substitute* "lisp/jka-compr.el" (("\"sh\"") - (format #f "~s" (search-input-file inputs "bin/sh")))) - + (format #f "~s" (search-input-file inputs "bin/sh"))) + ;; Substitute "dd" command. + (("\"/bin/dd\"") + (format #f "~s" (search-input-file inputs "bin/dd")))) ;; Substitute "awk" command. (substitute* '("lisp/gnus/nnspool.el" "lisp/org/ob-awk.el" diff --git a/gnu/packages/patches/emacs-native-comp-fix-filenames.patch b/gnu/packages/patches/emacs-native-comp-fix-filenames.patch index ae16fc260c5..c5f25037cda 100644 --- a/gnu/packages/patches/emacs-native-comp-fix-filenames.patch +++ b/gnu/packages/patches/emacs-native-comp-fix-filenames.patch @@ -235,6 +235,16 @@ Index: emacs/lisp/startup.el (defun startup--rescale-elt-match-p (font-pattern font-object) "Test whether FONT-OBJECT matches an element of `face-font-rescale-alist'. FONT-OBJECT is a font-object that specifies a font to test. +@@ -709,8 +709,6 @@ normal-top-level + (expand-file-name + (decode-coding-string dir coding t))) +- npath))) +- (setq startup--original-eln-load-path +- (copy-sequence native-comp-eln-load-path))) ++ npath)))) + (dolist (filesym '(data-directory doc-directory exec-directory + installation-directory + invocation-directory invocation-name @@ -771,9 +756,6 @@ It is the default value of the variable (unwind-protect (command-line) -- cgit v1.2.3