From mboxrd@z Thu Jan 1 00:00:00 1970 From: Achim Gratz Subject: Re: The "problem" with `flet' in Org-mode and (future) Emacs 24.2 Date: Mon, 23 Jul 2012 19:41:31 +0200 Message-ID: <874noyjrxw.fsf@Rainer.invalid> References: <20120718070338.GA907@smoon> <87bojdc9ja.fsf@gmx.com> <87sjcoudfm.fsf@Rainer.invalid> <87ipdko0al.fsf@gmx.com> <20120719123357.GC890@smoon> <20120720011945.GD890@smoon> <20120720030058.GE890@smoon> <87obnacoq6.fsf@gmx.com> Mime-Version: 1.0 Content-Type: text/plain Return-path: Received: from eggs.gnu.org ([208.118.235.92]:50608) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1StMdv-0003aY-8l for emacs-orgmode@gnu.org; Mon, 23 Jul 2012 13:42:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1StMds-0002N6-Me for emacs-orgmode@gnu.org; Mon, 23 Jul 2012 13:42:03 -0400 Received: from plane.gmane.org ([80.91.229.3]:40180) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1StMds-0002Mv-Fe for emacs-orgmode@gnu.org; Mon, 23 Jul 2012 13:42:00 -0400 Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1StMdf-0003YC-JE for emacs-orgmode@gnu.org; Mon, 23 Jul 2012 19:41:47 +0200 Received: from pd9eb4e67.dip.t-dialin.net ([217.235.78.103]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Mon, 23 Jul 2012 19:41:47 +0200 Received: from Stromeko by pd9eb4e67.dip.t-dialin.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Mon, 23 Jul 2012 19:41:47 +0200 List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: emacs-orgmode@gnu.org Eric Schulte writes: > Okay, I've noticed a number of these errors as well. It looks like the > old version of flet allowed the definition of recursive functions, but > the new cl-flet does not. The defalias checks for the wrong Emacs version. I've just built another Emacs24 which got version 24.1.2, of which the "2" really is the build number; this should fix it (trunk starts from 24.1.50.1): diff --git a/lisp/org-compat.el b/lisp/org-compat.el index 41ae999..ad04ccd 100644 --- a/lisp/org-compat.el +++ b/lisp/org-compat.el @@ -115,19 +115,11 @@ (defun org-emacs-full-version () ;;; cl macros no longer available in the trunk -(defalias 'org-flet (if (or (> emacs-major-version 24) - (and (= emacs-major-version 24) - (let ((full (org-emacs-full-version))) - (and (third full) - (> (third full) 1))))) +(defalias 'org-flet (if (org-version-check "24.1.50" "cl" :predicate) 'cl-flet* 'flet)) -(defalias 'org-labels (if (or (> emacs-major-version 24) - (and (= emacs-major-version 24) - (let ((full (org-emacs-full-version))) - (and (third full) - (> (third full) 1))))) +(defalias 'org-labels (if (org-version-check "24.1.50" "cl" :predicate) 'cl-labels 'labels)) Achim. -- +<[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]>+ Factory and User Sound Singles for Waldorf Q+, Q and microQ: http://Synth.Stromeko.net/Downloads.html#WaldorfSounds