[PATCH 1/1] emacs: removed code attempting to support emaces prior to version 23

diff --git a/5d/17fe3f43a004eb75bdd7e708045a8039323f46 b/5d/17fe3f43a004eb75bdd7e708045a8039323f46
new file mode 100644 (file)
index 0000000..dae6b07
--- /dev/null
+++ b/5d/17fe3f43a004eb75bdd7e708045a8039323f46
@@ -0,0 +1,115 @@
+Return-Path: <too@guru-group.fi>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id C8109431E64\r
+       for <notmuch@notmuchmail.org>; Sun, 31 Mar 2013 13:04:07 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+       autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id 7FJczp6Zvo94 for <notmuch@notmuchmail.org>;\r
+       Sun, 31 Mar 2013 13:04:06 -0700 (PDT)\r
+Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])\r
+       by olra.theworths.org (Postfix) with ESMTP id 1B54A431FAE\r
+       for <notmuch@notmuchmail.org>; Sun, 31 Mar 2013 13:04:06 -0700 (PDT)\r
+Received: by guru.guru-group.fi (Postfix, from userid 501)\r
+       id E78D51000CF; Sun, 31 Mar 2013 23:04:03 +0300 (EEST)\r
+From: Tomi Ollila <tomi.ollila@iki.fi>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 1/1] emacs: removed code attempting to support emaces prior to\r
+       version 23\r
+Date: Sun, 31 Mar 2013 23:04:02 +0300\r
+Message-Id: <1364760242-4039-1-git-send-email-tomi.ollila@iki.fi>\r
+X-Mailer: git-send-email 1.8.0\r
+Cc: tomi.ollila@iki.fi\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Sun, 31 Mar 2013 20:04:07 -0000\r
+\r
+The support for emacs version 22 has not worked at least since\r
+September 2011 when I attempted to use it. I expanded the support in\r
+id:yf6ippgtbn0.fsf@taco2.nixu.fi but that was not enough and then I\r
+found it easier to switch to emacs 23.\r
+In case one wants to resurrect emacs 22 (or earlier!) support, pick\r
+the changes from the patch email referenced above.\r
+---\r
+\r
+I suggested in IRC that we (first) deprecate this support, but as it has\r
+not worked like 18 months It is just simpler to drop it now. I'll do\r
+NEWS patch if this approach is accepted.\r
+\r
+ emacs/notmuch-lib.el | 36 ------------------------------------\r
+ 1 file changed, 36 deletions(-)\r
+\r
+diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el\r
+index f3ff3af..9b77379 100644\r
+--- a/emacs/notmuch-lib.el\r
++++ b/emacs/notmuch-lib.el\r
+@@ -203,19 +203,6 @@ user-friendly queries."\r
+       (setq list (cdr list)))\r
+     (nreverse out)))\r
+ \r
+-;; This lets us avoid compiling these replacement functions when emacs\r
+-;; is sufficiently new enough to supply them alone. We do the macro\r
+-;; treatment rather than just wrapping our defun calls in a when form\r
+-;; specifically so that the compiler never sees the code on new emacs,\r
+-;; (since the code is triggering warnings that we don't know how to get\r
+-;; rid of.\r
+-;;\r
+-;; A more clever macro here would accept a condition and a list of forms.\r
+-(defmacro compile-on-emacs-prior-to-23 (form)\r
+-  "Conditionally evaluate form only on emacs < emacs-23."\r
+-  (list 'when (< emacs-major-version 23)\r
+-      form))\r
+-\r
+ (defun notmuch-split-content-type (content-type)\r
+   "Split content/type into 'content' and 'type'"\r
+   (split-string content-type "/"))\r
+@@ -472,29 +459,6 @@ an error."\r
+             (json-read)))\r
+       (delete-file err-file)))))\r
+ \r
+-;; Compatibility functions for versions of emacs before emacs 23.\r
+-;;\r
+-;; Both functions here were copied from emacs 23 with the following copyright:\r
+-;;\r
+-;; Copyright (C) 1985, 1986, 1992, 1994, 1995, 1999, 2000, 2001, 2002, 2003,\r
+-;;   2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.\r
+-;;\r
+-;; and under the GPL version 3 (or later) exactly as notmuch itself.\r
+-(compile-on-emacs-prior-to-23\r
+- (defun apply-partially (fun &rest args)\r
+-   "Return a function that is a partial application of FUN to ARGS.\r
+-ARGS is a list of the first N arguments to pass to FUN.\r
+-The result is a new function which does the same as FUN, except that\r
+-the first N arguments are fixed at the values with which this function\r
+-was called."\r
+-   (lexical-let ((fun fun) (args1 args))\r
+-     (lambda (&rest args2) (apply fun (append args1 args2))))))\r
+-\r
+-(compile-on-emacs-prior-to-23\r
+- (defun mouse-event-p (object)\r
+-   "Return non-nil if OBJECT is a mouse click event."\r
+-   (memq (event-basic-type object) '(mouse-1 mouse-2 mouse-3 mouse-movement))))\r
+-\r
+ ;; This variable is used only buffer local, but it needs to be\r
+ ;; declared globally first to avoid compiler warnings.\r
+ (defvar notmuch-show-process-crypto nil)\r
+-- \r
+1.8.0\r
+\r