emacs-orgmode
[Top][All Lists]
Advanced

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

[O] Fix org-clock compilation on emacs 24.x


From: Kaushal Modi
Subject: [O] Fix org-clock compilation on emacs 24.x
Date: Mon, 25 Jul 2016 15:20:43 +0000

Hi all, 

I have a script that builds org individually for different emacs version.

I noticed just today that the build is failing for emacs 24.5.

=====
make compile-dirall
==================== dirall ====================
make[2]: Entering directory `/home/kmodi/.emacs.d/elisp/org-mode/lisp'
Checking /home/kmodi/.emacs.d/elisp/org-mode/lisp...
Compiling /home/kmodi/.emacs.d/elisp/org-mode/lisp/org-install.el...
Compiling /home/kmodi/.emacs.d/elisp/org-mode/lisp/org-loaddefs.el...
Compiling /home/kmodi/.emacs.d/elisp/org-mode/lisp/org-timer.el...

In toplevel form:
org-timer.el:38:1:Error: Symbol's function definition is void: incf
Compiling /home/kmodi/.emacs.d/elisp/org-mode/lisp/org-version.el...
Done (Total of 0 files compiled, 1 failed, 118 skipped)
make[2]: Leaving directory `/home/kmodi/.emacs.d/elisp/org-mode/lisp'
if [ ! -d /home/kmodi/usr_local/apps/6/emacs/24/share/emacs/site-lisp/org ] ; then \
          install -m 755 -d /home/kmodi/usr_local/apps/6/emacs/24/share/emacs/site-lisp/org ; \
        fi ;
install -m 644 -p <snip>
/home/kmodi/usr_local/apps/6/emacs/24/share/emacs/site-lisp/org
install: cannot stat `org-timer.elc': No such file or directory
make[1]: *** [install] Error 1
make[1]: Leaving directory `/home/kmodi/.emacs.d/elisp/org-mode/lisp'
make: *** [install-lisp] Error 2
=====

Below minor patch fixes that issue:

From 0b9c1b4a6cac2eec6f1ea5ff3a123fa7d8e3fc25 Mon Sep 17 00:00:00 2001
From: Kaushal Modi <address@hidden>
Date: Mon, 25 Jul 2016 11:18:51 -0400
Subject: [PATCH] Use cl-incf instead of incf

* org-clock.el (org-clock--oldest-date): Use the correct macro from
  `cl-lib' library.
---
 lisp/org-clock.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/org-clock.el b/lisp/org-clock.el
index 03e6a2c..fcc20e0 100644
--- a/lisp/org-clock.el
+++ b/lisp/org-clock.el
@@ -465,7 +465,7 @@ to add an effort property.")
   (let* ((dichotomy
   (lambda (min max pred)
     (if (funcall pred min) min
-      (incf min)
+      (cl-incf min)
       (while (> (- max min) 1)
  (let ((mean (+ (ash min -1) (ash max -1) (logand min max 1))))
   (if (funcall pred mean) (setq max mean) (setq min mean)))))
-- 
2.9.2

--

Kaushal Modi


reply via email to

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