From 4dad5812fa2b67adc7262a778829013995a904bc Mon Sep 17 00:00:00 2001 From: Jim Myhrberg Date: Sat, 23 Oct 2021 16:15:39 +0100 Subject: [PATCH] fix(patches): correctly use emacs 28.x and 29.x patches The master branch is now Emacs 29.x, and Emacs 28.x lives on the "emacs-28" release branch. --- build-emacs-for-macos | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/build-emacs-for-macos b/build-emacs-for-macos index 59a8fb7..8dc308c 100755 --- a/build-emacs-for-macos +++ b/build-emacs-for-macos @@ -640,8 +640,10 @@ class Build 'emacs-26' when /^emacs-27.*/ 'emacs-27' - else + when /^emacs-28.*/ 'emacs-28' + else + 'emacs-29' end end end @@ -649,14 +651,14 @@ class Build def patches(opts = {}) p = [] - if %w[emacs-26 emacs-27 emacs-28].include?(effective_version) + if %w[emacs-26 emacs-27 emacs-28 emacs-29].include?(effective_version) p << { url: 'https://github.com/d12frosted/homebrew-emacs-plus/raw/master/' \ "patches/#{effective_version}/fix-window-role.patch" } end - if %w[emacs-27 emacs-28].include?(effective_version) + if %w[emacs-27 emacs-28 emacs-29].include?(effective_version) p << { url: 'https://github.com/d12frosted/homebrew-emacs-plus/raw/master/' \ "patches/#{effective_version}/system-appearance.patch"