Skip to content

Instantly share code, notes, and snippets.

@ohneda
Created December 28, 2011 04:06
Show Gist options
  • Save ohneda/1526185 to your computer and use it in GitHub Desktop.
Save ohneda/1526185 to your computer and use it in GitHub Desktop.
patch for homebrew emacs-23.3b supporting emacs-inline.patch in non-japanese environments and ATOK24.
diff --git a/Library/Formula/emacs.rb b/Library/Formula/emacs.rb
index 856a34a..e46a312 100644
--- a/Library/Formula/emacs.rb
+++ b/Library/Formula/emacs.rb
@@ -28,7 +28,7 @@ class Emacs < Formula
def patches
p = []
-
+ p0 = []
# Fix for building with Xcode 4; harmless on Xcode 3.x.
unless ARGV.build_head?
p << "http://repo.or.cz/w/emacs.git/commitdiff_plain/c8bba48c5889c4773c62a10f7c3d4383881f11c1"
@@ -37,8 +37,10 @@ class Emacs < Formula
p << "https://raw.github.com/gist/1098107"
# Fix for the titlebar issue on Mac OS X 10.7
p << "https://raw.github.com/gist/1102744"
- # Fix for Shift key for IME users
- p << "https://raw.github.com/gist/1212776"
+ unless ARGV.include? "--ime"
+ # Fix for Shift key for IME users
+ p << "https://raw.github.com/gist/1212776"
+ end
end
if ARGV.include? "--cocoa"
@@ -46,7 +48,18 @@ class Emacs < Formula
p << "https://raw.github.com/gist/1012927"
end
- return p
+ if ARGV.include? "--ime"
+ p0 << "http://svn.sourceforge.jp/svnroot/macemacsjp/inline_patch/trunk/emacs-inline.patch?revision=573&root=macemacsjp"
+ p0 << "http://svn.sourceforge.jp/svnroot/macemacsjp/inline_patch/trunk/font.patch?revision=573&root=macemacsjp"
+ # Support ATOK24 for inline-patch
+ p0 << 'https://raw.github.com/gist/960080/55657368c5a7cc6eaad255f1d3e5c42ab8083ed0/cocoa-emacs-inline-atok24.patch'
+ # Fix for non-Japanese environment, using preferredLanguages instead of currentLocale.
+ # To use Japanese IME in non-Japanese environments, type the following in a terminal:
+ # defaults write org.gnu.Emacs AppleLanguages "(ja, en)"
+ p << 'https://raw.github.com/gist/1250669/2de76821f69014ead17fac574a30cf119dc10dd9/gistfile1.diff'
+ end
+
+ return { :p0 => p0, :p1 => p }
end
def install
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment