Skip to content

Commit

Permalink
fix(patches): correctly use emacs 28.x and 29.x patches
Browse files Browse the repository at this point in the history
The master branch is now Emacs 29.x, and Emacs 28.x lives on the
"emacs-28" release branch.
  • Loading branch information
jimeh committed Oct 23, 2021
1 parent 65bdff0 commit 4dad581
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions build-emacs-for-macos
Original file line number Diff line number Diff line change
Expand Up @@ -640,23 +640,25 @@ class Build
'emacs-26'
when /^emacs-27.*/
'emacs-27'
else
when /^emacs-28.*/
'emacs-28'
else
'emacs-29'
end
end
end

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"
Expand Down

0 comments on commit 4dad581

Please sign in to comment.