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