1 files changed, 12 insertions, 27 deletions
diff --git a/Library/Formula/notmuch.rb b/Library/Formula/notmuch.rb
index ed8386b57..05f8f3bc6 100644
--- a/Library/Formula/notmuch.rb
+++ b/Library/Formula/notmuch.rb
@@ -1,33 +1,18 @@
 require 'formula'
 
-class NewEnoughEmacs < Requirement
-  fatal true
-
-  def satisfied?
-    `emacs --version`.split("\n")[0] =~ /GNU Emacs (\d+)\./
-    major_version = ($1 || 0).to_i
-    major_version >= 23
-  end
-
-  def message
-    "Emacs support requires at least Emacs 23."
-  end
-end
-
 class Notmuch < Formula
-  homepage 'http://notmuchmail.org'
-  url 'http://notmuchmail.org/releases/notmuch-0.17.tar.gz'
-  sha1 '0fe14140126a0da04754f548edf7e7b135eeec86'
-
-  option "emacs", "Install emacs support."
-
-  depends_on NewEnoughEmacs if build.include? "emacs"
-  depends_on 'pkg-config' => :build
-  depends_on 'xapian'
-  depends_on 'talloc'
-  depends_on 'gmime'
-
-  # Fix for mkdir behavior change in 10.9: http://notmuchmail.org/pipermail/notmuch/2013/016388.html
+  homepage "http://notmuchmail.org"
+  url "http://notmuchmail.org/releases/notmuch-0.17.tar.gz"
+  sha1 "0fe14140126a0da04754f548edf7e7b135eeec86"
+
+  depends_on "pkg-config" => :build
+  depends_on "emacs" => :optional
+  depends_on "xapian"
+  depends_on "talloc"
+  depends_on "gmime"
+
+  # Fix for mkdir behavior change in 10.9:
+  # http://notmuchmail.org/pipermail/notmuch/2013/016388.html
   patch :DATA
 
   def install