emacs-orgmode
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [O] The "problem" with `flet' in Org-mode and (future) Emacs 24.2


From: Achim Gratz
Subject: Re: [O] The "problem" with `flet' in Org-mode and (future) Emacs 24.2
Date: Mon, 23 Jul 2012 19:41:31 +0200
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/24.1 (gnu/linux)

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




reply via email to

[Prev in Thread] Current Thread [Next in Thread]