From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kaushal Modi Subject: Fix org-clock compilation on emacs 24.x Date: Mon, 25 Jul 2016 15:20:43 +0000 Message-ID: Mime-Version: 1.0 Content-Type: multipart/alternative; boundary=94eb2c0313107abb980538775477 Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:33710) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bRhge-0001Tk-BU for emacs-orgmode@gnu.org; Mon, 25 Jul 2016 11:20:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bRhgc-0004OZ-7A for emacs-orgmode@gnu.org; Mon, 25 Jul 2016 11:20:55 -0400 Received: from mail-oi0-x241.google.com ([2607:f8b0:4003:c06::241]:34757) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bRhgb-0004OV-Uz for emacs-orgmode@gnu.org; Mon, 25 Jul 2016 11:20:54 -0400 Received: by mail-oi0-x241.google.com with SMTP id c199so16945761oig.1 for ; Mon, 25 Jul 2016 08:20:53 -0700 (PDT) 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" To: emacs-org list --94eb2c0313107abb980538775477 Content-Type: text/plain; charset=UTF-8 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 /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 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 --94eb2c0313107abb980538775477 Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable
Hi all,=C2=A0

I have a script that buil= ds org individually for different emacs version.

I= noticed just today that the build is failing for emacs 24.5.
=3D=3D=3D=3D=3D
make compile-dirall
= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D dirall =3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
make[2]: E= ntering directory `/home/kmodi/.emacs.d/elisp/org-mode/lisp'
= Checking /home/kmodi/.emacs.d/elisp/org-mode/lisp...
Compiling /h= ome/kmodi/.emacs.d/elisp/org-mode/lisp/org-install.el...
Compilin= g /home/kmodi/.emacs.d/elisp/org-mode/lisp/org-loaddefs.el...
Com= piling /home/kmodi/.emacs.d/elisp/org-mode/lisp/org-timer.el...
<= br>
In toplevel form:
org-timer.el:38:1:Error: Symbol&#= 39;s function definition is void: incf
Compiling /home/kmodi/.ema= cs.d/elisp/org-mode/lisp/org-version.el...
Done (Total of 0 files= compiled, 1 failed, 118 skipped)
make[2]: Leaving directory `/ho= me/kmodi/.emacs.d/elisp/org-mode/lisp'
if [ ! -d /home/kmodi/= usr_local/apps/6/emacs/24/share/emacs/site-lisp/org ] ; then \
= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 install -m 755 -d /home/kmodi/usr_local/= apps/6/emacs/24/share/emacs/site-lisp/org ; \
=C2=A0 =C2=A0 =C2= =A0 =C2=A0 fi ;
install -m 644 -p <snip>
/home/km= odi/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
=3D=3D=3D=3D=3D

Below minor patc= h fixes that issue:

From 0b9c1b4a6cac2eec6f1e= a5ff3a123fa7d8e3fc25 Mon Sep 17 00:00:00 2001
From: Kaushal Modi = <kaushal.modi@gmail.com>= ;
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
=C2=A0 `cl-lib= 9; library.
---
=C2=A0lisp/org-clock.el | 2 +-
=C2=A01 file changed, 1 insertion(+), 1 deletion(-)

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

--

Kaushal Modi

--94eb2c0313107abb980538775477--