Emacs 24.1

Signed-off-by: Adam Vandenberg <flangy@gmail.com>

1 files changed, 3 insertions, 46 deletions

diff --git a/Library/Formula/emacs.rb b/Library/Formula/emacs.rb
index afa82927c..c2e72e3ab 100644
--- a/Library/Formula/emacs.rb
+++ b/Library/Formula/emacs.rb
@@ -2,9 +2,9 @@ require 'formula'
 
 class Emacs < Formula
   homepage 'http://www.gnu.org/software/emacs/'
-  url 'http://ftpmirror.gnu.org/emacs/emacs-23.4.tar.bz2'
-  mirror 'http://ftp.gnu.org/pub/gnu/emacs/emacs-23.4.tar.bz2'
-  md5 '070c68ad8e3c31fb3cb2414feaf5e6f0'
+  url 'http://ftpmirror.gnu.org/emacs/emacs-24.1.tar.bz2'
+  mirror 'http://ftp.gnu.org/pub/gnu/emacs/emacs-24.1.tar.bz2'
+  sha1 'ab22d5bf2072d04faa4aebf819fef3dfe44aacca'
 
   if ARGV.include? "--use-git-head"
     head 'http://git.sv.gnu.org/r/emacs.git'
@@ -41,11 +41,6 @@ class Emacs < Formula
   def patches
     p = []
 
-    # Fix for building with Xcode 4; harmless on Xcode 3.x.
-    unless ARGV.build_head?
-      p << DATA
-    end
-
     if ARGV.include? "--cocoa"
       # Fullscreen patch, works against 23.3 and HEAD.
       p << "https://raw.github.com/gist/1746342/702dfe9e2dd79fddd536aa90d561efdeec2ba716"
@@ -84,13 +79,6 @@ class Emacs < Formula
       system "make bootstrap"
       system "make install"
       prefix.install "nextstep/Emacs.app"
-
-      unless ARGV.build_head?
-        bin.mkpath
-        ln_s prefix+'Emacs.app/Contents/MacOS/Emacs', bin+'emacs'
-        ln_s prefix+'Emacs.app/Contents/MacOS/bin/emacsclient', bin
-        ln_s prefix+'Emacs.app/Contents/MacOS/bin/etags', bin
-      end
     else
       if ARGV.include? "--with-x"
         ENV.x11
@@ -144,34 +132,3 @@ class Emacs < Formula
     return s
   end
 end
-
-__END__
-# Fix for the titlebar issue on Mac OS X 10.7
-diff --git a/src/nsterm.m b/src/nsterm.m
-index 30b73c2..234b8b5 100644
---- a/src/nsterm.m
-+++ b/src/nsterm.m
-@@ -5107,6 +5107,9 @@ ns_term_shutdown (int sig)
-   win = [[EmacsWindow alloc]
-             initWithContentRect: r
-                       styleMask: (NSResizableWindowMask |
-+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7
-+                                  NSTitledWindowMask |
-+#endif
-                                   NSMiniaturizableWindowMask |
-                                   NSClosableWindowMask)
-                         backing: NSBackingStoreBuffered
-
-# Fix for Shift key for IME users
-diff --git a/src/nsterm.m b/src/nsterm.m
-index 30b73c2..f0c154e 100644
---- a/src/nsterm.m
-+++ b/src/nsterm.m
-@@ -4489,6 +4489,7 @@ ns_term_shutdown (int sig)
- 
-       /* if it was a function key or had modifiers, pass it directly to emacs */
-       if (fnKeysym || (emacs_event->modifiers
-+                       && (emacs_event->modifiers != shift_modifier)
-                        && [[theEvent charactersIgnoringModifiers] length] > 0))
- /*[[theEvent characters] length] */
-         {